Fix warning cause by previous libdcp bump.

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

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 5d5d3316377c2c3e03a9af08d11254086bf479bd..387cca9f6a0a86dda8804fe3e2ad4c92e6d6baf5 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,54 +18,80 @@
 
 */
 
+
 #ifndef DCPOMATIC_VIDEO_VIEW_H
 #define DCPOMATIC_VIDEO_VIEW_H
 
+
 #include "lib/dcpomatic_time.h"
+#include "lib/exception_store.h"
+#include "lib/signaller.h"
 #include "lib/timer.h"
 #include "lib/types.h"
-#include "lib/exception_store.h"
-#include <boost/shared_ptr.hpp>
+#include <dcp/warnings.h>
+#include <dcp/types.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
-#include <boost/noncopyable.hpp>
 
-class Image;
-class wxWindow;
+
 class FilmViewer;
+class Image;
+class Player;
 class PlayerVideo;
+class wxWindow;
+
 
-class VideoView : public ExceptionStore, public boost::noncopyable
+class VideoView : public ExceptionStore, public Signaller
 {
 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;
+       /** Emitted from the GUI thread when a lot of frames are being dropped */
+       boost::signals2::signal<void()> TooManyDropped;
 
-       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;
@@ -80,6 +106,11 @@ public:
                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;
@@ -100,14 +131,29 @@ public:
                _three_d = t;
        }
 
-protected:
-       /* XXX_b: to remove */
-       friend class FilmViewer;
+       void set_optimise_for_j2k (bool o) {
+               _optimise_for_j2k = o;
+       }
 
-       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;
 
+       wxColour pad_colour () const;
+
+       wxColour outline_content_colour () const {
+               return wxColour(255, 0, 0);
+       }
+
+       wxColour outline_subtitles_colour () const {
+               return wxColour(0, 255, 0);
+       }
+
+       wxColour crop_guess_colour () const {
+               return wxColour(0, 0, 255);
+       }
+
        int video_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_frame_rate;
@@ -118,15 +164,12 @@ 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;
        }
 
-       void add_dropped () {
-               boost::mutex::scoped_lock lm (_mutex);
-               ++_dropped;
-       }
+       void add_dropped ();
 
        void add_get () {
                boost::mutex::scoped_lock lm (_mutex);
@@ -135,27 +178,26 @@ protected:
 
        FilmViewer* _viewer;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _in_watermark;
-       int _watermark_x;
-       int _watermark_y;
-#endif
-
        StateTimer _state_timer;
 
+       bool _optimise_for_j2k = false;
+
 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;
-       bool _three_d;
+       Eyes _eyes = Eyes::LEFT;
+       bool _three_d = false;
 
-       int _dropped;
-       int _gets;
+       int _dropped = 0;
+       struct timeval _dropped_check_period_start;
+       int _errored = 0;
+       int _gets = 0;
 };
 
+
 #endif