X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=d0041bd957e6394d62acdc1b79f995a7b43006a9;hp=d080c79a5957dd08b8639f81ef6c34736d264db9;hb=d6d5e36cbeb285c78c33d88a09882d964f83d563;hpb=195eb8204245c7b7765831d1cc1de295b63eb8a2 diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index d080c79a5..d0041bd95 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. @@ -19,12 +19,14 @@ */ /** @file src/film_viewer.h - * @brief A wx widget to view `thumbnails' of a Film. + * @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 #include @@ -38,7 +40,7 @@ class Butler; class ClosedCaptionsDialog; /** @class FilmViewer - * @brief A wx widget to view a preview of a Film. + * @brief A wx widget to view a Film. */ class FilmViewer { @@ -46,100 +48,146 @@ public: FilmViewer (wxWindow *); ~FilmViewer (); - 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 (); + void set_film (boost::shared_ptr); boost::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_by (dcpomatic::DCPTime by, bool accurate); /** @return our `playhead' position; this may not lie exactly on a frame boundary */ - DCPTime position () const { + dcpomatic::DCPTime position () const { return _video_position; } + dcpomatic::DCPTime one_video_frame () const; + + void start (); + bool stop (); + void suspend (); + void resume (); + bool playing () const { + return _playing; + } - void set_position (DCPTime p); - void set_position (boost::shared_ptr content, ContentTime p); void set_coalesce_player_changes (bool c); void set_dcp_decode_reduction (boost::optional reduction); boost::optional dcp_decode_reduction () const; + void set_outline_content (bool o); + void set_eyes (Eyes e); + void set_pad_black (bool p); void slow_refresh (); - bool quick_refresh (); int dropped () const { return _dropped; } - void start (); - bool stop (); - bool playing () const { - return _playing; + int audio_callback (void* out, unsigned int frames); + +#ifdef DCPOMATIC_VARIANT_SWAROOP + void set_background_image (bool b) { + _background_image = b; + refresh_view (); } - void move (DCPTime by); - DCPTime one_video_frame () const; - void seek (DCPTime t, bool accurate); - DCPTime video_position () const { - return _video_position; + bool background_image () const { + return _background_image; } - void go_to (DCPTime t); - void set_outline_content (bool o); - void set_eyes (Eyes e); +#endif - int audio_callback (void* out, unsigned int frames); + StateTimer const & state_timer () const { + return _state_timer; + } - void show_closed_captions (); + StateTimer& state_timer () { + return _state_timer; + } + + int gets () const { + return _gets; + } + + /* Some accessors 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; + } + bool pad_black () const { + return _pad_black; + } boost::signals2::signal)> ImageChanged; boost::signals2::signal PositionChanged; - boost::signals2::signal Started; - boost::signals2::signal Stopped; + 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 (); + + /* XXX_b: to remove */ + friend class SimpleVideoView; + + void video_view_sized (); void calculate_sizes (); - void check_play_state (); void player_change (ChangeType type, int, bool); - void get (); + bool get (bool lazy); + void idle_handler (); + void request_idle_get (); void display_player_video (); void film_change (ChangeType, Film::Property); - void timecode_clicked (); void recreate_butler (); void config_changed (Config::Property); - DCPTime time () const; - DCPTime uncorrected_time () const; + + dcpomatic::DCPTime time () const; + dcpomatic::DCPTime uncorrected_time () const; Frame average_latency () const; - void refresh_panel (); + + void refresh_view (); + 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; + std::pair, dcpomatic::DCPTime> _player_video; + dcpomatic::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; @@ -154,6 +202,20 @@ private: bool _outline_content; Eyes _eyes; + /** 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; + + /** true if an get() is required next time we are idle */ + bool _idle_get; boost::signals2::scoped_connection _config_changed_connection; };