projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add and use Content::has_mapped_audio().
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.cc
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index 17f0e73b5d1ccf58e9349cb608c6fe7571b954a2..727dcbf26d10ed540ac4231277316aaab4cfe923 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-77,7
+77,7
@@
DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
if (content->video) {
video = make_shared<VideoDecoder>(this, content);
}
if (content->video) {
video = make_shared<VideoDecoder>(this, content);
}
- if (content->
audio && !content->audio->mapping().mapped_output_channels().empty
()) {
+ if (content->
has_mapped_audio
()) {
audio = make_shared<AudioDecoder>(this, content->audio, fast);
}
for (auto i: content->text) {
audio = make_shared<AudioDecoder>(this, content->audio, fast);
}
for (auto i: content->text) {