projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "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 32deac2e8f56fc824e42aaa05472c66b6acacca2..ac868c17360068a429de9f5dec93abca4534b49e 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-388,7
+388,7
@@
DCPOMATIC_ENABLE_WARNINGS
#endif
Pango::init ();
#endif
Pango::init ();
- dcp::init ();
+ dcp::init (
tags_path()
);
#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
/* Render something to fontconfig to create its cache */
#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
/* Render something to fontconfig to create its cache */
@@
-825,8
+825,6
@@
audio_channel_types (list<int> mapped, int channels)
case dcp::CENTRE:
case dcp::LS:
case dcp::RS:
case dcp::CENTRE:
case dcp::LS:
case dcp::RS:
- case dcp::LC:
- case dcp::RC:
case dcp::BSL:
case dcp::BSR:
++non_lfe;
case dcp::BSL:
case dcp::BSR:
++non_lfe;
@@
-836,7
+834,6
@@
audio_channel_types (list<int> mapped, int channels)
case dcp::MOTION_DATA:
case dcp::SYNC_SIGNAL:
case dcp::SIGN_LANGUAGE:
case dcp::MOTION_DATA:
case dcp::SYNC_SIGNAL:
case dcp::SIGN_LANGUAGE:
- case dcp::UNUSED:
case dcp::CHANNEL_COUNT:
break;
}
case dcp::CHANNEL_COUNT:
break;
}