diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_content.cc | 10 | ||||
| -rw-r--r-- | src/lib/audio_content.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 04823d1e6..97372b962 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -119,17 +119,17 @@ AudioContent::set_audio_delay (int d) signal_changed (AudioContentProperty::AUDIO_DELAY); } -void +boost::signals2::connection AudioContent::analyse_audio (boost::function<void()> finished) { shared_ptr<const Film> film = _film.lock (); - if (!film) { - return; - } + assert (film); shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this()))); - job->Finished.connect (finished); + boost::signals2::connection c = job->Finished.connect (finished); JobManager::instance()->add (job); + + return c; } boost::filesystem::path diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index b100d7aba..ca4a1f234 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -58,7 +58,7 @@ public: virtual AudioMapping audio_mapping () const = 0; virtual void set_audio_mapping (AudioMapping) = 0; - void analyse_audio (boost::function<void()>); + boost::signals2::connection analyse_audio (boost::function<void()>); boost::filesystem::path audio_analysis_path () const; void set_audio_gain (float); |
