Basic support for 7.1/HI/VI audio tracks.

4 files changed, 19 insertions, 4 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8690d3ee0..f77273001 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -106,7 +106,7 @@ Film::Film (boost::filesystem::path dir)
 	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _video_frame_rate (24)
-	, _audio_channels (MAX_AUDIO_CHANNELS)
+	, _audio_channels (6)
 	, _three_d (false)
 	, _sequence_video (true)
 	, _interop (false)
diff --git a/src/lib/util.cc b/src/lib/util.cc
index a86033e57..25fbc130b 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -790,10 +790,11 @@ video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, fl
 string
 audio_channel_name (int c)
 {
-	assert (MAX_AUDIO_CHANNELS == 6);
+	assert (MAX_AUDIO_CHANNELS == 8);
 
 	/* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
-	   enhancement channel (sub-woofer).
+	   enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
+	   VI is the visually-impaired audio track (audio describe).
 	*/
 	string const channels[] = {
 		_("Left"),
@@ -802,6 +803,8 @@ audio_channel_name (int c)
 		_("Lfe (sub)"),
 		_("Left surround"),
 		_("Right surround"),
+		_("HI"),
+		_("VI")
 	};
 
 	return channels[c];
diff --git a/src/lib/util.h b/src/lib/util.h
index 9bf139b82..ef29cc08f 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 6
+#define MAX_AUDIO_CHANNELS 8
 
 #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 c08da0912..fe3219261 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -271,6 +271,10 @@ AudioMappingView::set_column_labels ()
 	int const c = _grid->GetNumberCols ();
 	
 	_grid->SetColLabelValue (0, _("Content channel"));
+
+#if MAX_AUDIO_CHANNELS != 8
+#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS
+#endif	
 	
 	if (c > 0) {
 		_grid->SetColLabelValue (1, _("L"));
@@ -296,6 +300,14 @@ AudioMappingView::set_column_labels ()
 		_grid->SetColLabelValue (6, _("Rs"));
 	}
 
+	if (c > 6) {
+		_grid->SetColLabelValue (7, _("HI"));
+	}
+
+	if (c > 7) {
+		_grid->SetColLabelValue (8, _("VI"));
+	}
+	
 	_grid->AutoSize ();
 }