Add NamedChannel and use it to hide the never-used channels

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 84138f4d94aa7194f2f1f9ce82edad04fa970174..7c0d1dc4e8b820f26888836db6a1e49cec61b76e 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -379,12 +379,12 @@ DCPOMATIC_ENABLE_WARNINGS
 
 #ifdef DCPOMATIC_WINDOWS
        putenv ("PANGOCAIRO_BACKEND=fontconfig");
-       putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str());
+       putenv (String::compose("FONTCONFIG_PATH=%1", resources_path().string()).c_str());
 #endif
 
 #ifdef DCPOMATIC_OSX
        setenv ("PANGOCAIRO_BACKEND", "fontconfig", 1);
-       setenv ("FONTCONFIG_PATH", shared_path().string().c_str(), 1);
+       setenv ("FONTCONFIG_PATH", resources_path().string().c_str(), 1);
 #endif
 
        Pango::init ();
@@ -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;
                }
        }
@@ -1259,10 +1261,10 @@ default_font_file ()
 {
        boost::filesystem::path liberation_normal;
        try {
-               liberation_normal = shared_path() / "LiberationSans-Regular.ttf";
+               liberation_normal = resources_path() / "LiberationSans-Regular.ttf";
                if (!boost::filesystem::exists (liberation_normal)) {
                        /* Hack for unit tests */
-                       liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf";
+                       liberation_normal = resources_path() / "fonts" / "LiberationSans-Regular.ttf";
                }
        } catch (boost::filesystem::filesystem_error& e) {