Use enum class for VideoRange.

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

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 5d40050de59fe9aaee717f8dda74df6482fc7724..f24a78f1cbee42cc5217aa38f12cd88a064e8cb0 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -161,7 +161,9 @@ GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
        wxSize canvas_size;
        {
                boost::mutex::scoped_lock lm (_canvas_mutex);
-               canvas_size = _canvas->GetSize ();
+               if (_canvas) {
+                       canvas_size = _canvas->GetSize ();
+               }
        }
 
        if (canvas_size.GetWidth() < 64 || canvas_size.GetHeight() < 0) {
@@ -341,7 +343,7 @@ GLVideoView::set_image_and_draw ()
 {
        shared_ptr<PlayerVideo> pv = player_video().first;
        if (pv) {
-               set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true));
+               set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true));
                draw (pv->inter_position(), pv->inter_size());
                _viewer->image_changed (pv);
        }