Rename Content::_file to path and support md5sums of directories.

[dcpomatic.git] / src / lib / analyse_audio_job.cc

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 2848c1ed773c16dfe5b6acbf0b3c0f6b61f65aac..df67b37d6144ea48740bd9fe2275de9d3b380072 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -50,7 +50,7 @@ AnalyseAudioJob::name () const
                return "";
        }
        
-       return String::compose (_("Analyse audio of %1"), content->file().filename());
+       return String::compose (_("Analyse audio of %1"), content->path());
 }
 
 void
@@ -70,8 +70,8 @@ AnalyseAudioJob::run ()
 
        _samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points);
 
-       _current.resize (_film->dcp_audio_channels ());
-       _analysis.reset (new AudioAnalysis (_film->dcp_audio_channels ()));
+       _current.resize (_film->audio_channels ());
+       _analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
        _done = 0;
        while (!player->pass ()) {