X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=0f99675191ef617101b35aaff0b411775d9e0201;hb=bb5acc8b8d783a4133b0b10285937d9151dc57c9;hp=a37d7581ed5451dbaaa1a3df4d9a75b992c812ef;hpb=7c730205e50014347bd96ab9735346d0b5922798;p=dcpomatic.git diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index a37d7581e..0f9967519 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,17 +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; @@ -39,10 +47,11 @@ class Player; class Butler; class ClosedCaptionsDialog; + /** @class FilmViewer * @brief A wx widget to view a Film. */ -class FilmViewer +class FilmViewer : public Signaller { public: FilmViewer (wxWindow *); @@ -59,22 +68,25 @@ public: 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 { - return _video_position; + return _video_view->position(); } dcpomatic::DCPTime one_video_frame () const; void start (); bool stop (); + void suspend (); + void resume (); + bool playing () const { return _playing; } @@ -83,62 +95,52 @@ 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 slow_refresh (); - int dropped () const { - return _dropped; - } - - int audio_callback (void* out, unsigned int frames); + dcpomatic::DCPTime time () const; + boost::optional audio_time () const; -#ifdef DCPOMATIC_VARIANT_SWAROOP - void set_background_image (bool b) { - _background_image = b; - refresh_view (); - } + int dropped () const; + int errored () const; + int gets () const; - bool background_image () const { - return _background_image; - } -#endif + int audio_callback (void* out, unsigned int frames); StateTimer const & state_timer () const { - return _state_timer; - } - - StateTimer& state_timer () { - return _state_timer; + return _video_view->state_timer (); } - int gets () const { - return _gets; - } - - /* Some accessors that VideoView classes need */ + /* Some accessors and utility methods that VideoView classes need */ dcp::Size out_size () const { return _out_size; } - dcp::Size inter_size () const { - return _inter_size; - } - Position inter_position () const { - return _inter_position; - } bool outline_content () const { return _outline_content; } + boost::optional> outline_subtitles () const { + return _outline_subtitles; + } bool pad_black () const { return _pad_black; } - dcpomatic::DCPTime video_position () const { - return _video_position; + 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); - boost::signals2::signal)> ImageChanged; - boost::signals2::signal PositionChanged; + bool pending_idle_get () const { + return _idle_get; + } + + 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) */ @@ -147,73 +149,60 @@ public: boost::signals2::signal PlaybackPermitted; private: + void video_view_sized (); - void timer (); void calculate_sizes (); void player_change (ChangeType type, int, bool); - bool get (bool lazy); + void player_change (std::vector properties); void idle_handler (); - void request_idle_get (); - void display_player_video (); + void request_idle_display_next_frame (); void film_change (ChangeType, Film::Property); void recreate_butler (); void config_changed (Config::Property); + void film_length_change (); + void ui_finished (); + void too_many_frames_dropped (); - dcpomatic::DCPTime time () const; dcpomatic::DCPTime uncorrected_time () const; Frame average_latency () const; - void refresh_view (); bool quick_refresh (); - boost::shared_ptr _film; - boost::shared_ptr _player; + std::shared_ptr _film; + std::shared_ptr _player; - VideoView* _video_view; - wxTimer _timer; - bool _coalesce_player_changes; - std::list _pending_player_changes; - - std::pair, dcpomatic::DCPTime> _player_video; - dcpomatic::DCPTime _video_position; - Position _inter_position; - dcp::Size _inter_size; + VideoView* _video_view = nullptr; + bool _coalesce_player_changes = false; + std::vector _pending_player_changes; /** Size of our output (including padding if we have any) */ dcp::Size _out_size; RtAudio _audio; - int _audio_channels; - unsigned int _audio_block_size; - bool _playing; - 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; - int _dropped; boost::optional _dcp_decode_reduction; - ClosedCaptionsDialog* _closed_captions_dialog; + ClosedCaptionsDialog* _closed_captions_dialog = nullptr; - bool _outline_content; - Eyes _eyes; + 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 - - StateTimer _state_timer; - int _gets; + 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; };