C++11 tidying.

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

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 8d9dce68d07e71a32a799ffb1778fede718d704c..d3a15d38c3e9573a252acecf49134333120be24a 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,55 +18,91 @@
 
 */
 
+
 #ifndef DCPOMATIC_VIDEO_VIEW_H
 #define DCPOMATIC_VIDEO_VIEW_H
 
+
 #include "lib/dcpomatic_time.h"
-#include <boost/shared_ptr.hpp>
+#include "lib/timer.h"
+#include "lib/types.h"
+#include "lib/exception_store.h"
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 
+
 class Image;
 class wxWindow;
 class FilmViewer;
+class Player;
 class PlayerVideo;
 
-class VideoView
+
+class VideoView : public ExceptionStore
 {
 public:
        VideoView (FilmViewer* viewer);
        virtual ~VideoView () {}
 
-       virtual void set_image (boost::shared_ptr<const Image> image) = 0;
+       VideoView (VideoView const&) = delete;
+       VideoView& operator= (VideoView const&) = delete;
+
+       /** @return the thing displaying the image */
        virtual wxWindow* get () const = 0;
-       /** Redraw the view after something has changed like content outlining,
-        *  the film being removed, etc.
-        */
+       /** Re-make and display the image from the current _player_video */
        virtual void update () = 0;
-
+       /** Called when playback starts */
        virtual void start ();
-       /* XXX_b: make pure */
+       /** Called when playback stops */
        virtual void stop () {}
 
+       enum NextFrameResult {
+               FAIL,
+               AGAIN,
+               SUCCESS
+       };
+
+       /** Get the next frame and display it; used after seek */
+       virtual NextFrameResult display_next_frame (bool) = 0;
+
        void clear ();
+       bool reset_metadata (std::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
+       /** Emitted from the GUI thread when our display changes in size */
        boost::signals2::signal<void()> Sized;
 
-       virtual bool display_next_frame (bool) = 0;
 
-       /* XXX_b: to remove */
-       virtual void display_player_video () {}
+       /* Accessors for FilmViewer */
 
        int dropped () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _dropped;
        }
 
+       int errored () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _errored;
+       }
+
+       int gets () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _gets;
+       }
+
+       StateTimer const & state_timer () const {
+               return _state_timer;
+       }
+
        dcpomatic::DCPTime position () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _player_video.second;
        }
 
+
+       /* Setters for FilmViewer so it can tell us our state and
+        * we can then use (thread) safely.
+        */
+
        void set_video_frame_rate (int r) {
                boost::mutex::scoped_lock lm (_mutex);
                _video_frame_rate = r;
@@ -77,12 +113,19 @@ public:
                _length = len;
        }
 
-protected:
-       /* XXX_b: to remove */
-       friend class FilmViewer;
+       void set_eyes (Eyes eyes) {
+               boost::mutex::scoped_lock lm (_mutex);
+               _eyes = eyes;
+       }
+
+       void set_three_d (bool t) {
+               boost::mutex::scoped_lock lm (_mutex);
+               _three_d = t;
+       }
 
-       bool get_next_frame (bool non_blocking);
-       int time_until_next_frame () const;
+protected:
+       NextFrameResult get_next_frame (bool non_blocking);
+       boost::optional<int> time_until_next_frame () const;
        dcpomatic::DCPTime one_video_frame () const;
 
        int video_frame_rate () const {
@@ -95,7 +138,7 @@ protected:
                return _length;
        }
 
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
+       std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _player_video;
        }
@@ -105,24 +148,30 @@ protected:
                ++_dropped;
        }
 
+       void add_get () {
+               boost::mutex::scoped_lock lm (_mutex);
+               ++_gets;
+       }
+
        FilmViewer* _viewer;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _in_watermark;
-       int _watermark_x;
-       int _watermark_y;
-#endif
+       StateTimer _state_timer;
 
 private:
-       /** Mutex protecting all the state in VideoView */
+       /** Mutex protecting all the state in this class */
        mutable boost::mutex _mutex;
 
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
-       int _video_frame_rate;
+       std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+       int _video_frame_rate = 0;
        /** length of the film we are playing, or 0 if there is none */
        dcpomatic::DCPTime _length;
+       Eyes _eyes = Eyes::LEFT;
+       bool _three_d = false;
 
-       int _dropped;
+       int _dropped = 0;
+       int _errored = 0;
+       int _gets = 0;
 };
 
+
 #endif