Extend maximum DCP audio channels to 16.

diff --git a/ChangeLog b/ChangeLog
index ea42e969488ff26b9d580c154971472be1845d3b..37eae4aebc2adca10311096cae9cc4ed5a5f32dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-12  Carl Hetherington  <cth@carlh.net>
+
+       * Extend maximum audio channels to 16 for an experiment.
+
 2015-11-12  c.hetherington  <cth@carlh.net>
 
        * Updated ru_RU translation from Igor Voytovich.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3cf46220ecde40a0d7b259351edfddf29964636d..4691925bce3b12d0dfb8650c07c0037baae64dd0 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1253,6 +1253,8 @@ Film::audio_output_names () const
                return audio_processor()->input_names ();
        }
 
+       DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
+
        vector<string> n;
        n.push_back (_("L"));
        n.push_back (_("R"));
@@ -1266,6 +1268,10 @@ Film::audio_output_names () const
        n.push_back (_("Rc"));
        n.push_back (_("BsL"));
        n.push_back (_("BsR"));
+       n.push_back (_("DBP"));
+       n.push_back (_("DBS"));
+       n.push_back (_("NC"));
+       n.push_back (_("NC"));
 
        return vector<string> (n.begin(), n.begin() + audio_channels ());
 }

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 77d66d07763f967cc436bb14883604f9dd4b2621..81963e0aa5bdac0cb4f3ca31f9392d4845cd76cb 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -474,7 +474,7 @@ ensure_ui_thread ()
 string
 audio_channel_name (int c)
 {
-       DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 12);
+       DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
 
        /// 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
@@ -492,6 +492,10 @@ audio_channel_name (int c)
                _("Right centre"),
                _("Left rear surround"),
                _("Right rear surround"),
+               _("D-BOX primary"),
+               _("D-BOX secondary"),
+               _("Unused"),
+               _("Unused")
        };
 
        return channels[c];

diff --git a/src/lib/util.h b/src/lib/util.h
index 143874c3b9431d804fae72babe070dc692d68bb4..5cfdae5f9b0b2b7fb09046cf79c029f2d6dd05ba 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -41,7 +41,7 @@ namespace dcp {
 }
 
 /** The maximum number of audio channels that we can have in a DCP */
-#define MAX_DCP_AUDIO_CHANNELS 12
+#define MAX_DCP_AUDIO_CHANNELS 16
 /** Message broadcast to find possible encoding servers */
 #define DCPOMATIC_HELLO "I mean really, Ray, it's used."
 /** Number of films to keep in history */

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index bd83a7a47bb1725487bfcac0e7d3b20e2e654116..10df6bbce9862de234e70ee95936bc0f7830ef92 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -697,7 +697,7 @@ void
 DCPPanel::setup_audio_channels_choice ()
 {
        vector<pair<string, string> > items;
-       for (int i = minimum_allowed_audio_channels(); i <= 12; i += 2) {
+       for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) {
                items.push_back (make_pair (dcp::raw_convert<string> (i), dcp::raw_convert<string> (i)));
        }