/*
- 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 <wx/wx.h>
#include <wx/glcanvas.h>
#include <dcp/util.h>
+#include <boost/atomic.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
GLVideoView (FilmViewer* viewer, wxWindow* parent);
~GLVideoView ();
- void set_image (boost::shared_ptr<const Image> image);
wxWindow* get () const {
return _canvas;
}
}
private:
+ void set_image (boost::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 ();
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 _playing_condition;
- bool _playing;
- bool _one_shot;
+ boost::condition _thread_work_condition;
+ boost::atomic<bool> _playing;
+ boost::atomic<bool> _one_shot;
boost::shared_ptr<wxTimer> _timer;
};