/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
#include "video_view.h"
#include "lib/signaller.h"
#include "lib/position.h"
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
#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
{
void start ();
void stop ();
- bool display_next_frame (bool);
+ NextFrameResult display_next_frame (bool);
bool vsync_enabled () const {
return _vsync_enabled;
}
private:
- void set_image (boost::shared_ptr<const Image> image);
+ 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 ();
void thread_playing ();
void request_one_shot ();
- void create ();
void check_for_butler_errors ();
+ void ensure_context ();
+ void size_changed (wxSizeEvent const &);
- /* 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;
+ boost::atomic<wxSize> _canvas_size;
+
GLuint _id;
boost::optional<dcp::Size> _size;
bool _have_storage;
boost::atomic<bool> _playing;
boost::atomic<bool> _one_shot;
- boost::shared_ptr<wxTimer> _timer;
+ std::shared_ptr<wxTimer> _timer;
};