diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-11 11:16:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-11 11:16:01 +0100 |
| commit | 65618b6b245a7ba25a7814e00d1d1510cfa61f64 (patch) | |
| tree | 22d41c04c16c7625d1271eb8821d269686f13f0b /src/lib/player.cc | |
| parent | a8af9a0b57b853b8a8cd8fa35adb3fc967d59ee7 (diff) | |
Rename subtitle_use -> use_subtitles.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 9e14b65b3..c8ac591a7 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -196,7 +196,7 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent) Changed (frequent); } else if ( - property == SubtitleContentProperty::SUBTITLE_USE || + property == SubtitleContentProperty::USE_SUBTITLES || property == SubtitleContentProperty::SUBTITLE_X_OFFSET || property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE || @@ -539,7 +539,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting) for (list<shared_ptr<Piece> >::const_iterator j = subs.begin(); j != subs.end(); ++j) { shared_ptr<SubtitleContent> subtitle_content = dynamic_pointer_cast<SubtitleContent> ((*j)->content); - if (!subtitle_content->subtitle_use ()) { + if (!subtitle_content->use_subtitles ()) { continue; } |