std::shared_ptr

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

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 73db3535d2775c7fdc84b46482e7a1143948a4fd..d8ee65da63e04d63fc572676d6ff7b9a2c8b24f8 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,13 +20,19 @@
 
 #include "video_view.h"
 #include "lib/signaller.h"
-#include <wx/wx.h>
+#include "lib/position.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
-#include <boost/shared_ptr.hpp>
+#include <boost/atomic.hpp>
 #include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
 #undef None
 #undef Success
+#undef Status
 
 class GLVideoView : public VideoView
 {
@@ -34,7 +40,6 @@ public:
        GLVideoView (FilmViewer* viewer, wxWindow* parent);
        ~GLVideoView ();
 
-       void set_image (boost::shared_ptr<const Image> image);
        wxWindow* get () const {
                return _canvas;
        }
@@ -42,25 +47,38 @@ public:
        void start ();
        void stop ();
 
-       bool display_next_frame (bool);
+       NextFrameResult display_next_frame (bool);
 
        bool vsync_enabled () const {
                return _vsync_enabled;
        }
 
 private:
-       void paint ();
-       void draw ();
+       void set_image (std::shared_ptr<const Image> image);
+       void set_image_and_draw ();
+       void draw (Position<int> inter_position, dcp::Size inter_size);
        void thread ();
-       wxGLContext* context () const;
+       void thread_playing ();
+       void request_one_shot ();
+       void check_for_butler_errors ();
 
+       /* Mutex for use of _canvas; it's only contended when our ::thread
+          is started up so this may be overkill.
+        */
+       boost::mutex _canvas_mutex;
        wxGLCanvas* _canvas;
-
        wxGLContext* _context;
-       mutable boost::mutex _context_mutex;
 
        GLuint _id;
        boost::optional<dcp::Size> _size;
+       bool _have_storage;
        bool _vsync_enabled;
-       boost::thread* _thread;
+       boost::thread _thread;
+
+       boost::mutex _playing_mutex;
+       boost::condition _thread_work_condition;
+       boost::atomic<bool> _playing;
+       boost::atomic<bool> _one_shot;
+
+       std::shared_ptr<wxTimer> _timer;
 };