Fix up SimpleVideoView.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 8ed566bfcbd5ce39abcfa836c25797128e38de87..5b2c5ff95abc78f21a9cbf47314bb9cef4f3eed5 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -28,6 +28,7 @@
 #include "wx_util.h"
 #include "closed_captions_dialog.h"
 #include "gl_video_view.h"
+#include "simple_video_view.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
@@ -79,7 +80,8 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS
 
 FilmViewer::FilmViewer (wxWindow* p)
        /* XXX: make this configurable */
-       : _video_view (new GLVideoView(p))
+//     : _video_view (new GLVideoView(p))
+       : _video_view (new SimpleVideoView(this, p))
        , _coalesce_player_changes (false)
        , _audio (DCPOMATIC_RTAUDIO_API)
        , _audio_channels (0)
@@ -132,7 +134,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
                _player.reset ();
                recreate_butler ();
                _frame.reset ();
-               refresh_panel ();
+               refresh_view ();
                return;
        }
 
@@ -207,9 +209,9 @@ FilmViewer::recreate_butler ()
 }
 
 void
-FilmViewer::refresh_panel ()
+FilmViewer::refresh_view ()
 {
-       _state_timer.set ("refresh-panel");
+       _state_timer.set ("refresh-view");
        _video_view->get()->Refresh ();
        _video_view->get()->Update ();
        _state_timer.unset ();
@@ -245,7 +247,7 @@ FilmViewer::display_player_video ()
 {
        if (!_player_video.first) {
                _frame.reset ();
-               refresh_panel ();
+               refresh_view ();
                return;
        }
 
@@ -290,7 +292,7 @@ FilmViewer::display_player_video ()
        _inter_position = _player_video.first->inter_position ();
        _inter_size = _player_video.first->inter_size ();
 
-       refresh_panel ();
+       refresh_view ();
 
        _closed_captions_dialog->update (time());
 }
@@ -346,7 +348,7 @@ void
 FilmViewer::set_outline_content (bool o)
 {
        _outline_content = o;
-       refresh_panel ();
+       refresh_view ();
 }
 
 void
@@ -561,7 +563,7 @@ FilmViewer::config_changed (Config::Property p)
 {
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-               refresh_panel ();
+               refresh_view ();
                return;
        }
 #endif