X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=15d6bfaf5b2f648d50f56fe3ce371640e997d0a4;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=972a88a5af2aee7c8ed1ef8a27378a37df5e475b;hpb=4dcc035993a3716b63c6d65f24d5d4fbcdc90845;p=dcpomatic.git diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 972a88a5a..15d6bfaf5 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-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -22,11 +22,17 @@ * @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 class wxToggleButton; class FFmpegPlayer; @@ -40,15 +46,19 @@ 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(); + } + + VideoView const * video_view () const { + return _video_view; } void show_closed_captions (); @@ -58,17 +68,20 @@ public: 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 (boost::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,77 +90,93 @@ 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; - } + 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); -#ifdef DCPOMATIC_VARIANT_SWAROOP - void set_background_image (bool b) { - _background_image = b; - refresh_panel (); + 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 { + return _butler; + } + ClosedCaptionsDialog* closed_captions_dialog () const { + return _closed_captions_dialog; + } + void finished (); + void image_changed (boost::shared_ptr video); + + bool pending_idle_get () const { + return _idle_get; } -#endif - boost::signals2::signal)> ImageChanged; - boost::signals2::signal PositionChanged; - boost::signals2::signal Started; - boost::signals2::signal Stopped; + 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; boost::signals2::signal PlaybackPermitted; private: - void paint_panel (); - void panel_sized (wxSizeEvent &); - void timer (); + + void video_view_sized (); void calculate_sizes (); void player_change (ChangeType type, int, bool); - void get (); - void display_player_video (); + 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); - bool maybe_draw_background_image (wxPaintDC& dc); + void film_length_change (); + void ui_finished (); - DCPTime time () const; - DCPTime uncorrected_time () const; + dcpomatic::DCPTime uncorrected_time () const; Frame average_latency () const; - void refresh_panel (); bool quick_refresh (); boost::shared_ptr _film; boost::shared_ptr _player; - /** The area that we put our image in */ - wxPanel* _panel; - wxTimer _timer; + VideoView* _video_view; bool _coalesce_player_changes; std::list _pending_player_changes; - std::pair, DCPTime> _player_video; - boost::shared_ptr _frame; - DCPTime _video_position; - Position _inter_position; - dcp::Size _inter_size; - /** 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; RtAudio _audio; int _audio_channels; unsigned int _audio_block_size; bool _playing; + int _suspended; boost::shared_ptr _butler; std::list _latency_history; @@ -155,24 +184,19 @@ private: mutable boost::mutex _latency_history_mutex; int _latency_history_count; - int _dropped; boost::optional _dcp_decode_reduction; ClosedCaptionsDialog* _closed_captions_dialog; bool _outline_content; - Eyes _eyes; + 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 _in_watermark; - int _watermark_x; - int _watermark_y; - bool _background_image; -#endif + /** true if an get() is required next time we are idle */ + bool _idle_get; boost::signals2::scoped_connection _config_changed_connection; };