DCPOMATIC_ENABLE_WARNINGS
#include <dcp/util.h>
#include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#undef None
}
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 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;
};