projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 3ae95cf5275d2ea0f5393c6d7d9abc40909e9501..ecf37b57662b6b89c198a15f3035626ba3b5dce7 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-219,7
+219,10
@@
Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
property == ContentProperty::TRIM_END ||
property == ContentProperty::PATH ||
property == VideoContentProperty::VIDEO_FRAME_TYPE ||
property == ContentProperty::TRIM_END ||
property == ContentProperty::PATH ||
property == VideoContentProperty::VIDEO_FRAME_TYPE ||
- property == DCPContentProperty::CAN_BE_PLAYED
+ property == DCPContentProperty::CAN_BE_PLAYED ||
+ property == SubRipContentProperty::SUBTITLE_COLOUR ||
+ property == SubRipContentProperty::SUBTITLE_OUTLINE ||
+ property == SubRipContentProperty::SUBTITLE_OUTLINE_COLOUR
) {
_have_valid_pieces = false;
) {
_have_valid_pieces = false;
@@
-783,6
+786,7
@@
Player::get_reel_assets ()
}
if (j->reference_subtitle ()) {
}
if (j->reference_subtitle ()) {
+ DCPOMATIC_ASSERT (k->main_subtitle ());
a.push_back (
ReferencedReelAsset (
k->main_subtitle (),
a.push_back (
ReferencedReelAsset (
k->main_subtitle (),