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
#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 ();
/* Mutex for use of _canvas; it's only contended when our ::thread
boost::atomic<bool> _playing;
boost::atomic<bool> _one_shot;
- boost::shared_ptr<wxTimer> _timer;
+ std::shared_ptr<wxTimer> _timer;
};