summaryrefslogtreecommitdiff
path: root/src/wx/gl_video_view.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx/gl_video_view.h')
-rw-r--r--src/wx/gl_video_view.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 9bf02a835..a3bbe716f 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -86,12 +86,11 @@ public:
private:
void size_changed(wxSizeEvent const &) override;
void thread_setup() override;
- void thread_body() override;
+ void thread_playing() override;
+ void draw() override;
+ boost::optional<int> time_until_next_frame () const override;
void set_image(std::shared_ptr<const PlayerVideo> pv);
- void draw();
- void thread_playing();
- void request_one_shot();
void check_for_butler_errors();
void ensure_context();
void setup_shaders();
@@ -131,11 +130,6 @@ private:
std::unique_ptr<Texture> _subtitle_texture;
bool _have_subtitle_to_render = false;
- boost::mutex _playing_mutex;
- boost::condition _thread_work_condition;
- boost::atomic<bool> _playing;
- boost::atomic<bool> _one_shot;
-
GLuint _vao;
GLint _fragment_type;
bool _setup_shaders_done = false;