More enum class additions.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index cc25ccdd5fbbd152f74d9ff6fecf087bcbb2a08f..f3155323974bfd7ee9191caeeb3109f1fe0098bd 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -184,8 +184,8 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
        _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
-       film_change (CHANGE_TYPE_DONE, Film::VIDEO_FRAME_RATE);
-       film_change (CHANGE_TYPE_DONE, Film::THREE_D);
+       film_change (ChangeType::DONE, Film::VIDEO_FRAME_RATE);
+       film_change (ChangeType::DONE, Film::THREE_D);
        film_length_change ();
 
        /* Keep about 1 second's worth of history samples */
@@ -217,7 +217,7 @@ FilmViewer::recreate_butler ()
                        Config::instance()->audio_mapping(_audio_channels),
                        _audio_channels,
                        bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
-                       VIDEO_RANGE_FULL,
+                       VideoRange::FULL,
                        false,
                        true
                        )
@@ -376,7 +376,7 @@ FilmViewer::stop ()
 void
 FilmViewer::player_change (ChangeType type, int property, bool frequent)
 {
-       if (type != CHANGE_TYPE_DONE || frequent) {
+       if (type != ChangeType::DONE || frequent) {
                return;
        }
 
@@ -407,7 +407,7 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
 void
 FilmViewer::film_change (ChangeType type, Film::Property p)
 {
-       if (type != CHANGE_TYPE_DONE) {
+       if (type != ChangeType::DONE) {
                return;
        }
 
@@ -463,8 +463,8 @@ FilmViewer::set_coalesce_player_changes (bool c)
        _coalesce_player_changes = c;
 
        if (!c) {
-               BOOST_FOREACH (int i, _pending_player_changes) {
-                       player_change (CHANGE_TYPE_DONE, i, false);
+               for (auto i: _pending_player_changes) {
+                       player_change (ChangeType::DONE, i, false);
                }
                _pending_player_changes.clear ();
        }
@@ -622,7 +622,7 @@ FilmViewer::average_latency () const
         }
 
         Frame total = 0;
-        BOOST_FOREACH (Frame i, _latency_history) {
+        for (auto i: _latency_history) {
                 total += i;
         }
 
@@ -710,7 +710,7 @@ FilmViewer::gets () const
 void
 FilmViewer::content_change (ChangeType type, int property)
 {
-       if (type != CHANGE_TYPE_DONE) {
+       if (type != ChangeType::DONE) {
                return;
        }