projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report the number of active channels in DCPs, not the number in the MXF.
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.cc
diff --git
a/src/lib/dcp_examiner.cc
b/src/lib/dcp_examiner.cc
index 9c4f899c6d0fd6697e70e0cc1238856bbc3116d8..50b19e2fd2918b01d0a953919af4ac531f0619cc 100644
(file)
--- a/
src/lib/dcp_examiner.cc
+++ b/
src/lib/dcp_examiner.cc
@@
-175,8
+175,8
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
auto asset = reel->main_sound()->asset();
if (!_audio_channels) {
auto asset = reel->main_sound()->asset();
if (!_audio_channels) {
- _audio_channels = asset->
channels
();
- } else if (_audio_channels.get() != asset->
channels
()) {
+ _audio_channels = asset->
active_channels
();
+ } else if (_audio_channels.get() != asset->
active_channels
()) {
throw DCPError (_("Mismatched audio channel counts in DCP"));
}
throw DCPError (_("Mismatched audio channel counts in DCP"));
}