X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Futil.cc;h=37b03c83605fa73c1131b6f15ee3216cd3bf2ecd;hb=4cf45229bf55344e708fead769f694f13bacf39c;hp=7824e7fed739f75d51063298d99ffe61fafcbb28;hpb=7ab22a7aa171aec36563b8ec0b7c0b69a36094fe;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index 7824e7fed..37b03c836 100644 --- 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,17 +825,15 @@ audio_channel_types (list 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::UNUSED: case dcp::CHANNEL_COUNT: break; }