Hide unused audio channels a bit more clearly, not giving them

names any more.  Add dcp::used_audio_channels().

diff --git a/src/types.cc b/src/types.cc
index 669d4fca86ad4145953e0a3ce5fc7285fa2e0823..2bcd7101eec0314f10a2c8a9737f5b6734d78647 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -841,3 +841,24 @@ dcp::channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dict
 }
 
 
+vector<dcp::Channel>
+dcp::used_audio_channels ()
+{
+       vector<dcp::Channel> c;
+       c.push_back (LEFT);
+       c.push_back (RIGHT);
+       c.push_back (CENTRE);
+       c.push_back (LFE);
+       c.push_back (LS);
+       c.push_back (RS);
+       c.push_back (HI);
+       c.push_back (VI);
+       c.push_back (BSL);
+       c.push_back (BSR);
+       c.push_back (MOTION_DATA);
+       c.push_back (SYNC_SIGNAL);
+       c.push_back (SIGN_LANGUAGE);
+       c.push_back (dcp::LEFT);
+       return c;
+}
+

diff --git a/src/types.h b/src/types.h
index ed0b7b843757f8f7e06306fc70c77e37e9bc4806..684145dd25fc13a681a7046fee5946f455182720 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -88,17 +88,18 @@ enum Channel {
        RS = 5,        ///< right surround
        HI = 6,
        VI = 7,
-       LC = 8,
-       RC = 9,
+       /* 8 and 9 are not used */
        BSL = 10,
        BSR = 11,
        MOTION_DATA = 12,
        SYNC_SIGNAL = 13,
        SIGN_LANGUAGE = 14,
-       UNUSED = 15,
+       /* 15 is not used */
        CHANNEL_COUNT = 16
 };
 
+std::vector<dcp::Channel> used_audio_channels ();
+
 
 enum MCASoundField
 {