Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

[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 de2632b0a7cd2556aa46086d8860548f7a0c2e07..88cd65fee64f0227d24960600b6664dc46721ae1 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -29,6 +29,7 @@
 
 using std::string;
 using std::max;
+using std::min;
 using std::cout;
 using boost::shared_ptr;
 
@@ -67,7 +68,7 @@ AnalyseAudioJob::run ()
        decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
        int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
-       _samples_per_point = min (1, total_audio_frames / _num_points);
+       _samples_per_point = max (int64_t (1), total_audio_frames / _num_points);
 
        _current.resize (_film->audio_stream()->channels ());
        _analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
@@ -83,7 +84,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b)
 {
        for (int i = 0; i < b->frames(); ++i) {
                for (int j = 0; j < b->channels(); ++j) {