Bump maximum audio channels to 12 so that we can (crudely) use

BsL/BsR.

Requested-by: Markus Raab

4 files changed, 33 insertions, 9 deletions

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 48b418d37..35385ab40 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -792,7 +792,7 @@ video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, fl
 string
 audio_channel_name (int c)
 {
-	assert (MAX_AUDIO_CHANNELS == 8);
+	assert (MAX_AUDIO_CHANNELS == 12);
 
 	/* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
 	   enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
@@ -805,8 +805,12 @@ audio_channel_name (int c)
 		_("Lfe (sub)"),
 		_("Left surround"),
 		_("Right surround"),
-		_("HI"),
-		_("VI")
+		_("Hearing impaired"),
+		_("Visually impaired"),
+		_("Left centre"),
+		_("Right centre"),
+		_("Left rear surround"),
+		_("Right rear surround"),
 	};
 
 	return channels[c];
diff --git a/src/lib/util.h b/src/lib/util.h
index fc17dc944..c05680859 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -49,7 +49,7 @@ extern "C" {
 #undef check
 
 /** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 8
+#define MAX_AUDIO_CHANNELS 12
 
 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
 
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index fe3219261..7fdecb8d5 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -34,7 +34,7 @@ using std::max;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-#define INDICATOR_SIZE 20
+#define INDICATOR_SIZE 16
 
 enum {
 	ID_off = 1,
@@ -270,9 +270,9 @@ AudioMappingView::set_column_labels ()
 {
 	int const c = _grid->GetNumberCols ();
 	
-	_grid->SetColLabelValue (0, _("Content channel"));
+	_grid->SetColLabelValue (0, _("Content"));
 
-#if MAX_AUDIO_CHANNELS != 8
+#if MAX_AUDIO_CHANNELS != 12
 #warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS
 #endif	
 	
@@ -307,7 +307,23 @@ AudioMappingView::set_column_labels ()
 	if (c > 7) {
 		_grid->SetColLabelValue (8, _("VI"));
 	}
-	
+
+	if (c > 8) {
+		_grid->SetColLabelValue (9, _("Lc"));
+	}
+
+	if (c > 9) {
+		_grid->SetColLabelValue (10, _("Rc"));
+	}
+
+	if (c > 10) {
+		_grid->SetColLabelValue (11, _("BsL"));
+	}
+
+	if (c > 11) {
+		_grid->SetColLabelValue (12, _("BsR"));
+	}
+
 	_grid->AutoSize ();
 }
 
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 2e8b24e36..124b92736 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -62,8 +62,12 @@ AudioPlot::AudioPlot (wxWindow* parent)
 	_colours.push_back (wxColour (  0, 139,   0));
 	_colours.push_back (wxColour (  0,   0, 139));
 	_colours.push_back (wxColour (255, 255,   0));
+	_colours.push_back (wxColour (  0, 255, 255));
+	_colours.push_back (wxColour (255,   0, 255));
+	_colours.push_back (wxColour (255,   0, 139));
+	_colours.push_back (wxColour (139,   0, 255));
 
-#if MAX_AUDIO_CHANNELS != 8
+#if MAX_AUDIO_CHANNELS != 12
 #warning AudioPlot::AudioPlot is expecting the wrong MAX_AUDIO_CHANNELS
 #endif