std::shared_ptr

[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 215511538ed013a0cc076a14d0a14a22c16fdddc..969264c2710d5656a22303c07c5b38f69660b23b 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -27,7 +27,7 @@
 #include "lib/cross.h"
 #include "lib/player_video.h"
 #include "lib/butler.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 #ifdef DCPOMATIC_OSX
@@ -40,7 +40,6 @@
 #ifdef DCPOMATIC_LINUX
 #include <GL/glu.h>
 #include <GL/glext.h>
-#include <GL/glxext.h>
 #endif
 
 #ifdef DCPOMATIC_WINDOWS
@@ -50,8 +49,11 @@
 #endif
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 static void
@@ -74,46 +76,10 @@ 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);
-       check_gl_error ("glGenTextures");
-       glBindTexture (GL_TEXTURE_2D, _id);
-       check_gl_error ("glBindTexture");
-       glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-       check_gl_error ("glPixelStorei");
 }
 
 GLVideoView::~GLVideoView ()
@@ -152,6 +118,11 @@ GLVideoView::update ()
                        return;
                }
        }
+
+       if (!_thread.joinable()) {
+               _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
+       }
+
        request_one_shot ();
 }
 
@@ -354,8 +325,9 @@ 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), false, true));
+               set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true));
                draw (pv->inter_position(), pv->inter_size());
+               _viewer->image_changed (pv);
        }
 }
 
@@ -366,10 +338,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) {
@@ -397,14 +405,16 @@ catch (boost::thread_interrupted& e)
        store_current ();
 }
 
-bool
+
+VideoView::NextFrameResult
 GLVideoView::display_next_frame (bool non_blocking)
 {
-       bool const r = get_next_frame (non_blocking);
+       NextFrameResult const r = get_next_frame (non_blocking);
        request_one_shot ();
        return r;
 }
 
+
 void
 GLVideoView::request_one_shot ()
 {
@@ -413,10 +423,3 @@ GLVideoView::request_one_shot ()
        _thread_work_condition.notify_all ();
 }
 
-void
-GLVideoView::create ()
-{
-       if (!_thread.joinable()) {
-               _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
-       }
-}