diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-31 23:47:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-31 23:47:14 +0100 |
| commit | e0255a64d22440d718e5512f34a4f21f0d37a21b (patch) | |
| tree | 61927018d28794c7c32c238bc37259bfddb2f01c /src/lib/player.cc | |
| parent | 8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 (diff) | |
Use enum class for Film::Property.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 74e7480f5..b696f04c1 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -120,7 +120,7 @@ Player::construct () _playlist_content_change_connection = playlist()->ContentChange.connect (bind(&Player::playlist_content_change, this, _1, _3, _4)); set_video_container_size (_film->frame_size ()); - film_change (ChangeType::DONE, Film::AUDIO_PROCESSOR); + film_change (ChangeType::DONE, Film::Property::AUDIO_PROCESSOR); setup_pieces (); seek (DCPTime (), true); @@ -333,9 +333,9 @@ Player::film_change (ChangeType type, Film::Property p) last time we were run. */ - if (p == Film::CONTAINER) { + if (p == Film::Property::CONTAINER) { Change (type, PlayerProperty::FILM_CONTAINER, false); - } else if (p == Film::VIDEO_FRAME_RATE) { + } else if (p == Film::Property::VIDEO_FRAME_RATE) { /* Pieces contain a FrameRateChange which contains the DCP frame rate, so we need new pieces here. */ @@ -343,12 +343,12 @@ Player::film_change (ChangeType type, Film::Property p) setup_pieces (); } Change (type, PlayerProperty::FILM_VIDEO_FRAME_RATE, false); - } else if (p == Film::AUDIO_PROCESSOR) { + } else if (p == Film::Property::AUDIO_PROCESSOR) { if (type == ChangeType::DONE && _film->audio_processor ()) { boost::mutex::scoped_lock lm (_mutex); _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ()); } - } else if (p == Film::AUDIO_CHANNELS) { + } else if (p == Film::Property::AUDIO_CHANNELS) { if (type == ChangeType::DONE) { boost::mutex::scoped_lock lm (_mutex); _audio_merger.clear (); |
