projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix enabled/disable overlapping video/audio with DCP content (part of #1355)
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 4280ad13aa7474b698a5255c3e2e635216d15ba2..ca210b5587ce45cbdd4eee40037649843246f41a 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-610,7
+610,7
@@
DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
static
bool check_video (shared_ptr<const Content> c)
{
static
bool check_video (shared_ptr<const Content> c)
{
- return static_cast<bool>(c->video);
+ return static_cast<bool>(c->video)
&& c->video->use()
;
}
bool
}
bool
@@
-643,7
+643,7
@@
DCPContent::can_reference_video (shared_ptr<const Film> film, string& why_not) c
static
bool check_audio (shared_ptr<const Content> c)
{
static
bool check_audio (shared_ptr<const Content> c)
{
- return static_cast<bool>(c->audio);
+ return static_cast<bool>(c->audio)
&& !c->audio->mapping().mapped_output_channels().empty()
;
}
bool
}
bool