Remove player activity logging. Fixes #2122.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 909bf0ac70b262f881e3694ba13e66049d2d12ab..0291b660fa403ea0e57359dc286216d5143be7f0 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file  src/film_viewer.h
  *  @brief FilmViewer class.
  */
 
+
 #include "video_view.h"
 #include "lib/film.h"
 #include "lib/config.h"
@@ -33,6 +35,8 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+#include <vector>
+
 
 class wxToggleButton;
 class FFmpegPlayer;
@@ -43,6 +47,7 @@ class Player;
 class Butler;
 class ClosedCaptionsDialog;
 
+
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */
@@ -57,7 +62,7 @@ public:
                return _video_view->get();
        }
 
-       VideoView const * video_view () const {
+       std::shared_ptr<const VideoView> video_view () const {
                return _video_view;
        }
 
@@ -90,9 +95,10 @@ public:
        void set_dcp_decode_reduction (boost::optional<int> reduction);
        boost::optional<int> dcp_decode_reduction () const;
        void set_outline_content (bool o);
-       void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
+       void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>>);
        void set_eyes (Eyes e);
        void set_pad_black (bool p);
+       void set_optimise_for_j2k (bool o);
 
        void slow_refresh ();
 
@@ -110,13 +116,10 @@ public:
        }
 
        /* Some accessors and utility methods that VideoView classes need */
-       dcp::Size out_size () const {
-               return _out_size;
-       }
        bool outline_content () const {
                return _outline_content;
        }
-       boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+       boost::optional<dcpomatic::Rect<double>> outline_subtitles () const {
                return _outline_subtitles;
        }
        bool pad_black () const {
@@ -136,10 +139,12 @@ public:
        }
 
        boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
-       boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
-       boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
+       boost::signals2::signal<void ()> Started;
+       boost::signals2::signal<void ()> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
        boost::signals2::signal<void ()> Finished;
+       /** Emitted from the GUI thread when a lot of frames are being dropped */
+       boost::signals2::signal<void()> TooManyDropped;
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
@@ -148,10 +153,10 @@ private:
        void video_view_sized ();
        void calculate_sizes ();
        void player_change (ChangeType type, int, bool);
+       void player_change (std::vector<int> properties);
        void idle_handler ();
        void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);
-       void content_change (ChangeType, int property);
        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();
@@ -165,38 +170,40 @@ private:
        std::shared_ptr<Film> _film;
        std::shared_ptr<Player> _player;
 
-       VideoView* _video_view;
-       bool _coalesce_player_changes;
-       std::list<int> _pending_player_changes;
-
-       /** Size of our output (including padding if we have any) */
-       dcp::Size _out_size;
+       std::shared_ptr<VideoView> _video_view;
+       bool _coalesce_player_changes = false;
+       std::vector<int> _pending_player_changes;
 
        RtAudio _audio;
-       int _audio_channels;
-       unsigned int _audio_block_size;
-       bool _playing;
-       int _suspended;
+       int _audio_channels = 0;
+       unsigned int _audio_block_size = 1024;
+       bool _playing = false;
+       int _suspended = 0;
        std::shared_ptr<Butler> _butler;
 
        std::list<Frame> _latency_history;
        /** Mutex to protect _latency_history */
        mutable boost::mutex _latency_history_mutex;
-       int _latency_history_count;
+       int _latency_history_count = 0;
 
        boost::optional<int> _dcp_decode_reduction;
 
-       ClosedCaptionsDialog* _closed_captions_dialog;
+       /** true to assume that this viewer is only being used for JPEG2000 sources
+        *  so it can optimise accordingly.
+        */
+       bool _optimise_for_j2k = false;
+
+       ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
 
-       bool _outline_content;
-       boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
+       bool _outline_content = false;
+       boost::optional<dcpomatic::Rect<double>> _outline_subtitles;
        /** true to pad the viewer panel with black, false to use
            the normal window background colour.
        */
-       bool _pad_black;
+       bool _pad_black = false;
 
        /** true if an get() is required next time we are idle */
-       bool _idle_get;
+       bool _idle_get = false;
 
        boost::signals2::scoped_connection _config_changed_connection;
 };