Merge master.

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

diff --git a/src/lib/single_stream_audio_content.cc b/src/lib/single_stream_audio_content.cc
index ac4da25ee720aa2253bd62262d703e28fd09cad6..52159760645ce12a5b27fcea2c650a78ef21e29b 100644 (file)
--- a/src/lib/single_stream_audio_content.cc
+++ b/src/lib/single_stream_audio_content.cc
@@ -23,6 +23,7 @@
 #include "film.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 using dcp::raw_convert;
 
@@ -92,10 +93,12 @@ SingleStreamAudioContent::take_from_audio_examiner (shared_ptr<AudioExaminer> ex
        signal_changed (AudioContentProperty::AUDIO_LENGTH);
        signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
 
+       int const p = processed_audio_channels ();
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                /* XXX: do this in signal_changed...? */
-               _audio_mapping = AudioMapping (_audio_channels);
+               _audio_mapping = AudioMapping (p);
                _audio_mapping.make_default ();
        }