diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-01 18:04:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-01 18:04:14 +0100 |
| commit | 92b6430402753a572c33d594ba0745a4e461edf4 (patch) | |
| tree | d9bd040ee243cfe0e1730fc2df18d97adc7f2e8e /src/lib | |
| parent | c5b9ad09ab5eaf032b0816f619ab5d75254e8597 (diff) | |
Re-add show audio button and analyse just that content when it is clicked.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/analyse_audio_job.cc | 2 | ||||
| -rw-r--r-- | src/lib/film.cc | 4 | ||||
| -rw-r--r-- | src/lib/film.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index 2146b03c5..1cec15c2a 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -89,7 +89,7 @@ AnalyseAudioJob::run () } _analysis->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ())); - _analysis->write (_film->audio_analysis_path ()); + _analysis->write (_film->audio_analysis_path (_playlist)); set_progress (1); set_state (FINISHED_OK); diff --git a/src/lib/film.cc b/src/lib/film.cc index dbb73303c..5310ef71f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -228,12 +228,12 @@ Film::internal_video_asset_filename () const } boost::filesystem::path -Film::audio_analysis_path () const +Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const { boost::filesystem::path p = dir ("analysis"); MD5Digester digester; - BOOST_FOREACH (shared_ptr<Content> i, content ()) { + BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) { shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (i); if (!ac) { continue; diff --git a/src/lib/film.h b/src/lib/film.h index 23478c478..f1df57142 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -69,7 +69,7 @@ public: boost::filesystem::path internal_video_asset_dir () const; boost::filesystem::path internal_video_asset_filename () const; - boost::filesystem::path audio_analysis_path () const; + boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const; void send_dcp_to_tms (); void make_dcp (); |