diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-03 13:17:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-03 13:17:37 +0100 |
| commit | fa61fc99549264810e17fcd35abffe9e8ddab5b2 (patch) | |
| tree | 855ce952ed8b416bbab33cd6debbd0f2b7379597 /src/lib/audio_stream.cc | |
| parent | 3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7 (diff) | |
Various work on audio mapping.
Fix everything up so that the audio mapping view in
the audio panel reflects the processor (or lack of).
Diffstat (limited to 'src/lib/audio_stream.cc')
| -rw-r--r-- | src/lib/audio_stream.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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 (); } |