Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc
index a4fa8bd9b8472c84ecbd84b8734f3957922b379c..2119d08344566ef48e9f6a9186079035abd7b1ca 100644 (file)
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -19,11 +19,12 @@
 
 #include "audio_stream.h"
 #include "audio_mapping.h"
+#include "util.h"
 
 AudioStream::AudioStream (int frame_rate, int channels)
        : _frame_rate (frame_rate)
 {
-       _mapping = AudioMapping (channels);
+       _mapping = AudioMapping (channels, MAX_DCP_AUDIO_CHANNELS);
 }
 
 AudioStream::AudioStream (int frame_rate, AudioMapping mapping)
@@ -40,16 +41,9 @@ AudioStream::set_mapping (AudioMapping mapping)
        _mapping = mapping;
 }
 
-void
-AudioStream::set_frame_rate (int frame_rate)
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       _frame_rate = frame_rate;
-}
-
 int
 AudioStream::channels () const
 {
        boost::mutex::scoped_lock lm (_mutex);
-       return _mapping.content_channels ();
+       return _mapping.input_channels ();
 }