From df406d54526f0f1d562f361d3f96b298ba4ff4d3 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 May 2014 14:58:18 -0700 Subject: [PATCH] Fix compilation with GCC --- src/project.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/project.h b/src/project.h index 3ef619182..7f252c3a0 100644 --- a/src/project.h +++ b/src/project.h @@ -29,7 +29,7 @@ class wxString; namespace agi { struct Context; } class Project { - std::unique_ptr audio_provider; + std::unique_ptr<::AudioProvider> audio_provider; std::unique_ptr video_provider; agi::vfr::Framerate timecodes; std::vector keyframes; @@ -39,7 +39,7 @@ class Project { agi::fs::path timecodes_file; agi::fs::path keyframes_file; - agi::signal::Signal AnnounceAudioProviderModified; + agi::signal::Signal<::AudioProvider *> AnnounceAudioProviderModified; agi::signal::Signal AnnounceVideoProviderModified; agi::signal::Signal AnnounceTimecodesModified; agi::signal::Signal const&> AnnounceKeyframesModified; @@ -74,7 +74,7 @@ public: void LoadAudio(agi::fs::path const& path); void CloseAudio(); - AudioProvider *AudioProvider() const { return audio_provider.get(); } + ::AudioProvider *AudioProvider() const { return audio_provider.get(); } agi::fs::path const& AudioName() const { return audio_file; } void LoadVideo(agi::fs::path const& path);