X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=0291b660fa403ea0e57359dc286216d5143be7f0;hp=def8d16cd7271771a8ae4e4bbe03c0186c2ab13f;hb=cfbe9d2f44e380efed7a61b5b5c7a2fec7794915;hpb=7ad0a57e369823a0537642f0ad07db01b7826030 diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index def8d16cd..0291b660f 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,15 +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; @@ -37,38 +47,46 @@ 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 *); ~FilmViewer (); - /** @return the panel showing the film's video */ - wxPanel* panel () const { - return _panel; + /** @return the window showing the film's video */ + wxWindow* panel () const { + return _video_view->get(); + } + + 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 (DCPTime t, bool accurate); - void seek (boost::shared_ptr content, ContentTime p, bool accurate); - void seek_by (DCPTime by, bool accurate); + void seek (dcpomatic::DCPTime t, 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 */ - DCPTime position () const { - return _video_position; + dcpomatic::DCPTime position () const { + return _video_view->position(); } - DCPTime one_video_frame () const; + dcpomatic::DCPTime one_video_frame () const; void start (); bool stop (); + void suspend (); + void resume (); + bool playing () const { return _playing; } @@ -77,79 +95,115 @@ 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 (); - int dropped () const { - return _dropped; - } + dcpomatic::DCPTime time () const; + boost::optional audio_time () const; + + int dropped () const; + int errored () const; + int gets () const; int audio_callback (void* out, unsigned int frames); - boost::signals2::signal)> ImageChanged; - boost::signals2::signal PositionChanged; + StateTimer const & state_timer () const { + return _video_view->state_timer (); + } + + /* Some accessors and utility methods that VideoView classes need */ + bool outline_content () const { + return _outline_content; + } + boost::optional> outline_subtitles () const { + return _outline_subtitles; + } + bool pad_black () const { + return _pad_black; + } + 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 Started; boost::signals2::signal Stopped; - boost::signals2::signal FilmChanged; + /** 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; private: - void paint_panel (); - void panel_sized (wxSizeEvent &); - void timer (); + + void video_view_sized (); void calculate_sizes (); - void check_play_state (); void player_change (ChangeType type, int, bool); - void get (); - void display_player_video (); + void player_change (std::vector properties); + void idle_handler (); + void request_idle_display_next_frame (); void film_change (ChangeType, Film::Property); - void timecode_clicked (); void recreate_butler (); void config_changed (Config::Property); - DCPTime time () const; - DCPTime uncorrected_time () const; - Frame average_latency () const; - void refresh_panel (); - bool quick_refresh (); + void film_length_change (); + void ui_finished (); - boost::shared_ptr _film; - boost::shared_ptr _player; + dcpomatic::DCPTime uncorrected_time () const; + Frame average_latency () const; - /** The area that we put our image in */ - wxPanel* _panel; - wxTimer _timer; - bool _coalesce_player_changes; - std::list _pending_player_changes; + bool quick_refresh (); - std::pair, DCPTime> _player_video; - boost::shared_ptr _frame; - DCPTime _video_position; - Position _inter_position; - dcp::Size _inter_size; + std::shared_ptr _film; + std::shared_ptr _player; - /** Size of our output (including padding if we have any) */ - dcp::Size _out_size; - /** Size of the panel that we have available */ - dcp::Size _panel_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; - 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; + /** 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 = false; + boost::optional> _outline_subtitles; + /** true to pad the viewer panel with black, false to use + the normal window background colour. + */ + bool _pad_black = false; - bool _outline_content; - Eyes _eyes; + /** true if an get() is required next time we are idle */ + bool _idle_get = false; boost::signals2::scoped_connection _config_changed_connection; };