X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_stream.cc;h=bf55e025502aeac06d9fefeff44c438d9a23f598;hb=fa61fc99549264810e17fcd35abffe9e8ddab5b2;hp=a4fa8bd9b8472c84ecbd84b8734f3957922b379c;hpb=3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7;p=dcpomatic.git diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc index a4fa8bd9b..bf55e0255 100644 --- 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) @@ -51,5 +52,5 @@ int AudioStream::channels () const { boost::mutex::scoped_lock lm (_mutex); - return _mapping.content_channels (); + return _mapping.input_channels (); }