X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=a59468c363579ab8a6d7d92c74c5fe47c2095e4b;hp=d6d9a99a82b38e95dd7622f470ef2ded524f7656;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index d6d9a99a8..a59468c36 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,123 +40,157 @@ 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 : public wxPanel +class FilmViewer { public: - FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true); + FilmViewer (wxWindow *); ~FilmViewer (); + /** @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 back_frame (); - void forward_frame (); + bool background_image () const { + return _background_image; + } +#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 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; + } + bool pad_black () const { + return _pad_black; + } + boost::shared_ptr butler () const { + return _butler; + } + int time_until_next_frame () const; boost::signals2::signal)> ImageChanged; + boost::signals2::signal PositionChanged; + 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 slider_moved (bool page); - void slider_released (); - void play_clicked (); - void timer (); + + /* XXX_b: to remove */ + friend class SimpleVideoView; + friend class GLVideoView; + friend class VideoView; + + void video_view_sized (); void calculate_sizes (); - void check_play_state (); - void active_jobs_changed (boost::optional); - void rewind_clicked (wxMouseEvent &); - void back_clicked (wxKeyboardState& s); - void forward_clicked (wxKeyboardState &); void player_change (ChangeType type, int, bool); - void update_position_label (); - void update_position_slider (); - void get (); - void display_player_video (); - void seek (DCPTime t, bool accurate); - void refresh_panel (); - void setup_sensitivity (); - void film_changed (Film::Property); - DCPTime nudge_amount (wxKeyboardState &); - void timecode_clicked (); - void frame_number_clicked (); - void go_to (DCPTime t); - void jump_to_selected_clicked (); + void idle_handler (); + void request_idle_get (); + void film_change (ChangeType, Film::Property); 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; - DCPTime one_video_frame () const; + + void refresh_view (); + bool quick_refresh (); boost::shared_ptr _film; boost::shared_ptr _player; - wxSizer* _v_sizer; - /** The area that we put our image in */ - wxPanel* _panel; - wxCheckBox* _outline_content; - wxChoice* _eye; - wxCheckBox* _jump_to_selected; - wxSlider* _slider; - wxButton* _rewind_button; - wxButton* _back_button; - wxButton* _forward_button; - wxStaticText* _frame_number; - wxStaticText* _timecode; - wxToggleButton* _play_button; - wxTimer _timer; + VideoView* _video_view; bool _coalesce_player_changes; std::list _pending_player_changes; - bool _slider_being_moved; - bool _was_running_before_slider; - std::pair, DCPTime> _player_video; - boost::shared_ptr _frame; - DCPTime _video_position; + 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; @@ -167,5 +203,22 @@ private: ClosedCaptionsDialog* _closed_captions_dialog; + 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; };