Fixes for building with newer wxWidgets.

[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 a87249fafdd73d637bfc4649e36ea8137e32a0c3..a82d5a27688e156f0c5eab8f8b7aa82fdc6de02d 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -40,7 +40,6 @@
 #ifdef DCPOMATIC_LINUX
 #include <GL/glu.h>
 #include <GL/glext.h>
-#include <GL/glxext.h>
 #endif
 
 #ifdef DCPOMATIC_WINDOWS
@@ -53,6 +52,17 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
+
+static void
+check_gl_error (char const * last)
+{
+       GLenum const e = glGetError ();
+       if (e != GL_NO_ERROR) {
+               throw GLError (last, e);
+       }
+}
+
+
 GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        : VideoView (viewer)
        , _have_storage (false)
@@ -63,53 +73,20 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        _canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
        _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 */
-               Display* dpy = wxGetX11Display();
-               glXSwapIntervalEXT (dpy, DefaultScreen(dpy), 1);
-               _vsync_enabled = true;
-       }
-#endif
-
-#ifdef DCPOMATIC_WINDOWS
-       if (_canvas->IsExtensionSupported("WGL_EXT_swap_control")) {
-               /* Enable vsync */
-               PFNWGLSWAPINTERVALEXTPROC swap = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
-               if (swap) {
-                       swap (1);
-                       _vsync_enabled = true;
-               }
-       }
-
-#endif
-
-#ifdef DCPOMATIC_OSX
-       /* Enable vsync */
-       GLint swapInterval = 1;
-       CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &swapInterval);
-       _vsync_enabled = true;
-#endif
-
-       glGenTextures (1, &_id);
-       glBindTexture (GL_TEXTURE_2D, _id);
-       glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
 }
 
 GLVideoView::~GLVideoView ()
 {
+       boost::this_thread::disable_interruption dis;
+
        try {
                _thread.interrupt ();
                _thread.join ();
-       } catch (...) {
-
-       }
+       } catch (...) {}
 
        glDeleteTextures (1, &_id);
 }
@@ -128,18 +105,14 @@ GLVideoView::check_for_butler_errors ()
        }
 }
 
-static void
-check_gl_error (char const * last)
-{
-       GLenum const e = glGetError ();
-       if (e != GL_NO_ERROR) {
-               throw GLError (last, e);
-       }
-}
 
 void
 GLVideoView::update ()
 {
+       if (!_thread.joinable()) {
+               _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
+       }
+
        {
                boost::mutex::scoped_lock lm (_canvas_mutex);
                if (!_canvas->IsShownOnScreen()) {
@@ -257,6 +230,7 @@ DCPOMATIC_ENABLE_WARNINGS
        }
 
        glFlush();
+       check_gl_error ("glFlush");
 
        boost::mutex::scoped_lock lm (_canvas_mutex);
        _canvas->SwapBuffers();
@@ -359,10 +333,46 @@ try
 {
        {
                boost::mutex::scoped_lock lm (_canvas_mutex);
-               _context = new wxGLContext (_canvas); //local
+               _context = new wxGLContext (_canvas);
                _canvas->SetCurrent (*_context);
        }
 
+
+#if defined(DCPOMATIC_LINUX) && defined(DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT)
+       if (_canvas->IsExtensionSupported("GLX_EXT_swap_control")) {
+               /* Enable vsync */
+               Display* dpy = wxGetX11Display();
+               glXSwapIntervalEXT (dpy, DefaultScreen(dpy), 1);
+               _vsync_enabled = true;
+       }
+#endif
+
+#ifdef DCPOMATIC_WINDOWS
+       if (_canvas->IsExtensionSupported("WGL_EXT_swap_control")) {
+               /* Enable vsync */
+               PFNWGLSWAPINTERVALEXTPROC swap = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
+               if (swap) {
+                       swap (1);
+                       _vsync_enabled = true;
+               }
+       }
+
+#endif
+
+#ifdef DCPOMATIC_OSX
+       /* Enable vsync */
+       GLint swapInterval = 1;
+       CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &swapInterval);
+       _vsync_enabled = true;
+#endif
+
+       glGenTextures (1, &_id);
+       check_gl_error ("glGenTextures");
+       glBindTexture (GL_TEXTURE_2D, _id);
+       check_gl_error ("glBindTexture");
+       glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+       check_gl_error ("glPixelStorei");
+
        while (true) {
                boost::mutex::scoped_lock lm (_playing_mutex);
                while (!_playing && !_one_shot) {
@@ -406,10 +416,3 @@ GLVideoView::request_one_shot ()
        _thread_work_condition.notify_all ();
 }
 
-void
-GLVideoView::create ()
-{
-       if (!_thread.joinable()) {
-               _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
-       }
-}