diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-02 11:20:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-14 10:20:41 +0100 |
| commit | d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5 (patch) | |
| tree | e974870e7e4b6014520b461a19a7b336eb7617a3 /src/wx/audio_dialog.cc | |
| parent | c138f4050bffbdc97edca8a824297f155dc62da3 (diff) | |
Add option to analyse audio automatically when content is added (#673).
Diffstat (limited to 'src/wx/audio_dialog.cc')
| -rw-r--r-- | src/wx/audio_dialog.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index a14498359..d4108f89c 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -133,14 +133,11 @@ AudioDialog::try_to_load_analysis () shared_ptr<const Film> film = _film.lock (); DCPOMATIC_ASSERT (film); - boost::filesystem::path path = film->audio_analysis_path (_playlist); - + boost::filesystem::path const path = film->audio_analysis_path (_playlist); if (!boost::filesystem::exists (path)) { _plot->set_analysis (shared_ptr<AudioAnalysis> ()); _analysis.reset (); - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist)); - _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); - JobManager::instance()->add (job); + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); return; } @@ -148,9 +145,7 @@ AudioDialog::try_to_load_analysis () _analysis.reset (new AudioAnalysis (path)); } catch (xmlpp::exception& e) { /* Probably an old-style analysis file: recreate it */ - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist)); - _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); - JobManager::instance()->add (job); + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); return; } |