X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=5e5bb791660c0ebfe4d295adf03cfb0c1508908b;hb=23aa3071850761144798112a5aaea61304de8586;hp=60cde60d00139b10fb6a6546995e1eca66b50196;hpb=f77529bdfa01ae13f889442900988fc401b63c62;p=dcpomatic.git diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 60cde60d0..5e5bb7916 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,18 +18,25 @@ */ + /** @file src/film_viewer.h * @brief FilmViewer class. */ + #include "video_view.h" #include "lib/film.h" #include "lib/config.h" #include "lib/player_text.h" #include "lib/timer.h" #include "lib/signaller.h" +#include "lib/warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS +#include + class wxToggleButton; class FFmpegPlayer; @@ -40,6 +47,7 @@ class Player; class Butler; class ClosedCaptionsDialog; + /** @class FilmViewer * @brief A wx widget to view a Film. */ @@ -54,19 +62,19 @@ public: return _video_view->get(); } - VideoView const * video_view () const { + std::shared_ptr video_view () const { return _video_view; } void show_closed_captions (); - void set_film (boost::shared_ptr); - boost::shared_ptr film () const { + void set_film (std::shared_ptr); + std::shared_ptr film () const { return _film; } void seek (dcpomatic::DCPTime t, bool accurate); - void seek (boost::shared_ptr content, dcpomatic::ContentTime p, bool accurate); + void seek (std::shared_ptr content, dcpomatic::ContentTime p, bool accurate); void seek_by (dcpomatic::DCPTime by, bool accurate); /** @return our `playhead' position; this may not lie exactly on a frame boundary */ dcpomatic::DCPTime position () const { @@ -87,8 +95,10 @@ public: void set_dcp_decode_reduction (boost::optional reduction); boost::optional dcp_decode_reduction () const; void set_outline_content (bool o); + void set_outline_subtitles (boost::optional>); void set_eyes (Eyes e); void set_pad_black (bool p); + void set_optimise_for_j2k (bool o); void slow_refresh (); @@ -96,48 +106,45 @@ public: boost::optional audio_time () const; int dropped () const; + int errored () const; int gets () const; int audio_callback (void* out, unsigned int frames); -#ifdef DCPOMATIC_VARIANT_SWAROOP - void set_background_image (bool b) { - _background_image = b; - _video_view->update (); - } - - bool background_image () const { - return _background_image; - } -#endif - StateTimer const & state_timer () const { return _video_view->state_timer (); } /* 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> outline_subtitles () const { + return _outline_subtitles; + } bool pad_black () const { return _pad_black; } - boost::shared_ptr butler () const { + std::shared_ptr butler () const { return _butler; } ClosedCaptionsDialog* closed_captions_dialog () const { return _closed_captions_dialog; } void finished (); + void image_changed (std::shared_ptr video); + + bool pending_idle_get () const { + return _idle_get; + } - boost::signals2::signal)> ImageChanged; + boost::signals2::signal)> ImageChanged; boost::signals2::signal Started; boost::signals2::signal Stopped; /** While playing back we reached the end of the film (emitted from GUI thread) */ boost::signals2::signal Finished; + /** Emitted from the GUI thread when a lot of frames are being dropped */ + boost::signals2::signal TooManyDropped; boost::signals2::signal PlaybackPermitted; @@ -146,6 +153,7 @@ private: void video_view_sized (); void calculate_sizes (); void player_change (ChangeType type, int, bool); + void player_change (std::vector properties); void idle_handler (); void request_idle_display_next_frame (); void film_change (ChangeType, Film::Property); @@ -159,44 +167,43 @@ private: bool quick_refresh (); - boost::shared_ptr _film; - boost::shared_ptr _player; + std::shared_ptr _film; + std::shared_ptr _player; - VideoView* _video_view; - bool _coalesce_player_changes; - std::list _pending_player_changes; - - /** Size of our output (including padding if we have any) */ - dcp::Size _out_size; + std::shared_ptr _video_view; + bool _coalesce_player_changes = false; + std::vector _pending_player_changes; RtAudio _audio; - int _audio_channels; - unsigned int _audio_block_size; - bool _playing; - int _suspended; - boost::shared_ptr _butler; + int _audio_channels = 0; + unsigned int _audio_block_size = 1024; + bool _playing = false; + int _suspended = 0; + std::shared_ptr _butler; std::list _latency_history; /** Mutex to protect _latency_history */ mutable boost::mutex _latency_history_mutex; - int _latency_history_count; + int _latency_history_count = 0; boost::optional _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; + bool _outline_content = false; + boost::optional> _outline_subtitles; /** true to pad the viewer panel with black, false to use the normal window background colour. */ - bool _pad_black; - -#ifdef DCPOMATIC_VARIANT_SWAROOP - bool _background_image; -#endif + 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; };