Re-allow audio channel 15 to be mapped so that users can add

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 8ac395b37f07a7b8df30937e1396238615337eea..37b03c83605fa73c1131b6f15ee3216cd3bf2ecd 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -388,7 +388,7 @@ DCPOMATIC_ENABLE_WARNINGS
 #endif
 
        Pango::init ();
-       dcp::init ();
+       dcp::init (tags_path());
 
 #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
        /* Render something to fontconfig to create its cache */
@@ -592,7 +592,7 @@ short_audio_channel_name (int c)
                _("DBP"),
                _("DBS"),
                "",
-               ""
+               _("Sign")
        };
 
        return channels[c];
@@ -825,14 +825,16 @@ audio_channel_types (list<int> mapped, int channels)
                case dcp::CENTRE:
                case dcp::LS:
                case dcp::RS:
-               case dcp::LC:
-               case dcp::RC:
                case dcp::BSL:
                case dcp::BSR:
                        ++non_lfe;
                        break;
                case dcp::HI:
                case dcp::VI:
+               case dcp::MOTION_DATA:
+               case dcp::SYNC_SIGNAL:
+               case dcp::SIGN_LANGUAGE:
+               case dcp::CHANNEL_COUNT:
                        break;
                }
        }