More tidying up.

[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 a1be8ca301816f77e5b3e52017e0452d4a70d0de..2da16f1df7775b726044c3fd9f0c370e1ac19db1 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -20,11 +20,13 @@
 
 #include "gl_video_view.h"
 #include "film_viewer.h"
+#include "wx_util.h"
 #include "lib/image.h"
 #include "lib/dcpomatic_assert.h"
 #include "lib/exceptions.h"
 #include "lib/cross.h"
 #include "lib/player_video.h"
+#include "lib/butler.h"
 #include <boost/bind.hpp>
 #include <iostream>
 
@@ -59,10 +61,14 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        , _one_shot (false)
 {
        _canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
-       _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this));
+       _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::update, this));
        _canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
        _canvas->Bind (wxEVT_CREATE, boost::bind(&GLVideoView::create, this));
 
+       _canvas->Bind (wxEVT_TIMER, boost::bind(&GLVideoView::check_for_butler_errors, this));
+       _timer.reset (new wxTimer(_canvas));
+       _timer->Start (2000);
+
 #if defined(DCPOMATIC_LINUX) && defined(DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT)
        if (_canvas->IsExtensionSupported("GLX_EXT_swap_control")) {
                /* Enable vsync */
@@ -105,6 +111,16 @@ GLVideoView::~GLVideoView ()
        glDeleteTextures (1, &_id);
 }
 
+void
+GLVideoView::check_for_butler_errors ()
+{
+       try {
+               _viewer->butler()->rethrow ();
+       } catch (DecodeError& e) {
+               error_dialog (get(), e.what());
+       }
+}
+
 static void
 check_gl_error (char const * last)
 {
@@ -114,25 +130,20 @@ check_gl_error (char const * last)
        }
 }
 
-void
-GLVideoView::paint ()
-{
-       request_one_shot ();
-}
-
 void
 GLVideoView::update ()
 {
-       if (!_canvas->IsShownOnScreen()) {
-               return;
+       {
+               boost::mutex::scoped_lock lm (_canvas_mutex);
+               if (!_canvas->IsShownOnScreen()) {
+                       return;
+               }
        }
-       /* XXX_b */
-//     wxClientDC dc (_canvas);
-//     draw ();
+       request_one_shot ();
 }
 
 void
-GLVideoView::draw ()
+GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)
 {
        glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
        check_gl_error ("glClear");
@@ -147,16 +158,22 @@ GLVideoView::draw ()
        check_gl_error ("glDisable GL_DEPTH_TEST");
        glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-       if (_canvas->GetSize().x < 64 || _canvas->GetSize().y < 0) {
+       wxSize canvas_size;
+       {
+               boost::mutex::scoped_lock lm (_canvas_mutex);
+               canvas_size = _canvas->GetSize ();
+       }
+
+       if (canvas_size.GetWidth() < 64 || canvas_size.GetHeight() < 0) {
                return;
        }
 
-       glViewport (0, 0, _canvas->GetSize().x, _canvas->GetSize().y);
+       glViewport (0, 0, canvas_size.GetWidth(), canvas_size.GetHeight());
        check_gl_error ("glViewport");
        glMatrixMode (GL_PROJECTION);
        glLoadIdentity ();
 
-       gluOrtho2D (0, _canvas->GetSize().x, _canvas->GetSize().y, 0);
+       gluOrtho2D (0, canvas_size.GetWidth(), canvas_size.GetHeight(), 0);
        check_gl_error ("gluOrtho2d");
        glMatrixMode (GL_MODELVIEW);
        glLoadIdentity ();
@@ -189,8 +206,6 @@ GLVideoView::draw ()
                glEnd ();
        }
 
-       wxSize const canvas_size = _canvas->GetSize ();
-
        if (!_viewer->pad_black() && out_size.width < canvas_size.GetWidth()) {
                glBegin (GL_QUADS);
                /* XXX: these colours are right for GNOME; may need adjusting for other OS */
@@ -224,8 +239,6 @@ GLVideoView::draw ()
        if (_viewer->outline_content()) {
                glColor3ub (255, 0, 0);
                glBegin (GL_LINE_LOOP);
-               Position<int> inter_position = _viewer->inter_position ();
-               dcp::Size inter_size = _viewer->inter_size ();
                glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
                glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
                glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);
@@ -235,6 +248,8 @@ GLVideoView::draw ()
        }
 
        glFlush();
+
+       boost::mutex::scoped_lock lm (_canvas_mutex);
        _canvas->SwapBuffers();
 }
 
@@ -267,6 +282,8 @@ GLVideoView::set_image (shared_ptr<const Image> image)
 void
 GLVideoView::start ()
 {
+       VideoView::start ();
+
        boost::mutex::scoped_lock lm (_playing_mutex);
        _playing = true;
        _playing_condition.notify_all ();
@@ -283,9 +300,11 @@ void
 GLVideoView::thread ()
 try
 {
-       /* XXX_b: check all calls and signal emissions in this method & protect them if necessary */
-       _context = new wxGLContext (_canvas);
-       _canvas->SetCurrent (*_context);
+       {
+               boost::mutex::scoped_lock lm (_canvas_mutex);
+               _context = new wxGLContext (_canvas); //local
+               _canvas->SetCurrent (*_context);
+       }
 
        while (true) {
                boost::mutex::scoped_lock lm (_playing_mutex);
@@ -295,35 +314,39 @@ try
                _one_shot = false;
                lm.unlock ();
 
+               Position<int> inter_position;
+               dcp::Size inter_size;
                if (length() != dcpomatic::DCPTime()) {
                        dcpomatic::DCPTime const next = position() + one_video_frame();
 
                        if (next >= length()) {
-                               _viewer->stop ();
-                               _viewer->emit_finished ();
+                               _viewer->finished ();
                                continue;
                        }
 
                        get_next_frame (false);
                        set_image (player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+                       inter_position = player_video().first->inter_position();
+                       inter_size = player_video().first->inter_size();
                }
-               draw ();
+               draw (inter_position, inter_size);
 
                while (time_until_next_frame() < 5) {
                        get_next_frame (true);
+                       add_dropped ();
                }
 
                boost::this_thread::interruption_point ();
                dcpomatic_sleep_milliseconds (time_until_next_frame());
        }
 
-       delete _context;
+       /* XXX: leaks _context, but that seems preferable to deleting it here
+        * without also deleting the wxGLCanvas.
+        */
 }
 catch (boost::thread_interrupted& e)
 {
-       /* XXX_b: store exceptions here */
-       delete _context;
-       return;
+       store_current ();
 }
 
 bool