A little thread safety.

[dcpomatic.git] / src / wx / video_view.h

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 80d6a50fc454050174de5bad6dcd598548cd85f0..d9ef2a65f4859afd8a8bea01dd8ef9abd0c8642b 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -21,12 +21,15 @@
 #ifndef DCPOMATIC_VIDEO_VIEW_H
 #define DCPOMATIC_VIDEO_VIEW_H
 
+#include "lib/dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
 
 class Image;
 class wxWindow;
 class FilmViewer;
+class PlayerVideo;
 
 class VideoView
 {
@@ -46,22 +49,55 @@ public:
 
        /* XXX_b: make pure */
        virtual void start () {}
+       /* XXX_b: make pure */
+       virtual void stop () {}
+
+       void clear ();
 
        boost::signals2::signal<void()> Sized;
 
+       virtual bool display_next_frame (bool) = 0;
+
        /* XXX_b: to remove */
-       virtual bool get (bool) {
-               return true;
+       virtual void display_player_video () {}
+
+       dcpomatic::DCPTime position () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _player_video.second;
+       }
+
+       void set_film (boost::shared_ptr<const Film> film) {
+               boost::mutex::scoped_lock lm (_mutex);
+               _film = film;
        }
 
 protected:
+       /* XXX_b: to remove */
+       friend class FilmViewer;
+
+       bool get_next_frame (bool non_blocking);
+       int time_until_next_frame () const;
+       dcpomatic::DCPTime one_video_frame () const;
+
+       boost::shared_ptr<const Film> film () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _film;
+       }
+
        FilmViewer* _viewer;
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+
+       /** Mutex protecting all the state in VideoView */
+       mutable boost::mutex _mutex;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        bool _in_watermark;
        int _watermark_x;
        int _watermark_y;
 #endif
+
+private:
+       boost::shared_ptr<const Film> _film;
 };
 
 #endif