From fa61fc99549264810e17fcd35abffe9e8ddab5b2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 3 Jun 2015 13:17:37 +0100
Subject: Various work on audio mapping.

Fix everything up so that the audio mapping view in
the audio panel reflects the processor (or lack of).
---
 src/lib/audio_stream.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/audio_stream.cc')

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 ();
 }
-- 
cgit v1.2.3