A little thread safety.

[dcpomatic.git] / src / wx / gl_video_view.cc

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index c69ab210ab5e962c3ea099043c72a4f20640a4f9..c3a6112831750641cedc226733010ba83b70fb94 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -55,6 +55,7 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        : VideoView (viewer)
        , _vsync_enabled (false)
        , _thread (0)
+       , _one_shot (false)
 {
        _canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
        _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this));
@@ -105,7 +106,7 @@ GLVideoView::~GLVideoView ()
 }
 
 static void
-       check_gl_error (char const * last)
+check_gl_error (char const * last)
 {
        GLenum const e = glGetError ();
        if (e != GL_NO_ERROR) {
@@ -266,6 +267,31 @@ GLVideoView::start ()
        _thread = new boost::thread (boost::bind(&GLVideoView::thread, this));
 }
 
+void
+GLVideoView::stop ()
+{
+       if (_thread) {
+               _thread->interrupt ();
+               _thread->join ();
+       }
+       delete _thread;
+       _thread = 0;
+}
+
+bool
+GLVideoView::one_shot () const
+{
+       boost::mutex::scoped_lock lm (_one_shot_mutex);
+       return _one_shot;
+}
+
+void
+GLVideoView::set_one_shot (bool s)
+{
+       boost::mutex::scoped_lock lm (_one_shot_mutex);
+       _one_shot = s;
+}
+
 void
 GLVideoView::thread ()
 try
@@ -278,26 +304,37 @@ try
        }
 
        while (true) {
-               if (!_viewer->film() || !_viewer->playing()) {
+               if (!film() && !one_shot()) {
+                       /* XXX: this should be an indefinite wait until
+                          one of our conditions becomes true.
+                        */
                        dcpomatic_sleep_milliseconds (40);
                        continue;
                }
 
-               dcpomatic::DCPTime const next = _viewer->position() + _viewer->one_video_frame();
+               set_one_shot (false);
+
+               dcpomatic::DCPTime const next = position() + one_video_frame();
 
-               if (next >= _viewer->film()->length()) {
+               if (next >= film()->length()) {
                        _viewer->stop ();
-                       _viewer->Finished ();
-                       return;
+                       _viewer->emit_finished ();
+                       continue;
                }
 
                get_next_frame (false);
-               set_image (_player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+               {
+                       boost::mutex::scoped_lock lm (_mutex);
+                       set_image (_player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+               }
                draw ();
-               _viewer->_video_position = _player_video.second;
 
-               std::cout << "sleep " << _viewer->time_until_next_frame() << "\n";
-               dcpomatic_sleep_milliseconds (_viewer->time_until_next_frame());
+               while (time_until_next_frame() < 5) {
+                       get_next_frame (true);
+               }
+
+               boost::this_thread::interruption_point ();
+               dcpomatic_sleep_milliseconds (time_until_next_frame());
        }
 
        {
@@ -318,3 +355,19 @@ GLVideoView::context () const
        boost::mutex::scoped_lock lm (_context_mutex);
        return _context;
 }
+
+bool
+GLVideoView::display_next_frame (bool non_blocking)
+{
+       bool const g = get_next_frame (non_blocking);
+       set_one_shot (true);
+       return g;
+}
+
+dcpomatic::DCPTime
+GLVideoView::one_video_frame () const
+{
+       return dcpomatic::DCPTime::from_frames (1, film()->video_frame_rate());
+}
+
+