Rename refresh_metadata -> reset_metadata.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 997fe88c8b8c4dba04c7885a79ce54e4261a65ac..7adf2ba2d16b49716536c179eb16319fb4f22c01 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -93,9 +93,6 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
        , _outline_content (false)
        , _pad_black (false)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , _background_image (false)
-#endif
        , _idle_get (false)
 {
        switch (Config::instance()->video_view_type()) {
@@ -215,10 +212,12 @@ FilmViewer::recreate_butler ()
 
        _butler.reset(
                new Butler(
+                       _film,
                        _player,
                        Config::instance()->audio_mapping(_audio_channels),
                        _audio_channels,
                        bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+                       VIDEO_RANGE_FULL,
                        false,
                        true
                        )
@@ -443,7 +442,7 @@ FilmViewer::quick_refresh ()
        if (!_video_view || !_film || !_player) {
                return true;
        }
-       return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
+       return _video_view->reset_metadata (_film, _player->video_container_size());
 }
 
 void
@@ -506,13 +505,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
 void
 FilmViewer::config_changed (Config::Property p)
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-               _video_view->update ();
-               return;
-       }
-#endif
-
        if (p == Config::AUDIO_MAPPING) {
                recreate_butler ();
                return;
@@ -534,11 +526,7 @@ FilmViewer::config_changed (Config::Property p)
                                        if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
                                                break;
                                        }
-#ifdef DCPOMATIC_USE_RTERROR
-                               } catch (RtError&) {
-#else
                                } catch (RtAudioError&) {
-#endif
                                        /* Something went wrong with that device so we don't want to use it anyway */
                                }
                                ++st;
@@ -557,11 +545,7 @@ FilmViewer::config_changed (Config::Property p)
                        sp.nChannels = _audio_channels;
                        sp.firstChannel = 0;
                        _audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this);
-#ifdef DCPOMATIC_USE_RTERROR
-               } catch (RtError& e) {
-#else
                } catch (RtAudioError& e) {
-#endif
                        _audio_channels = 0;
                        error_dialog (
                                _video_view->get(),