X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=0222d31c95bf487e9dd2375162b5c5a199334c42;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=f8658be3834cb1a3f0866e269620bd1edbc0e9c7;hpb=e0c524cbc4f006a4319c3ce8aa7625f9d70d054a;p=dcpomatic.git diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index f8658be38..0222d31c9 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -19,11 +19,13 @@ */ /** @file src/film_viewer.h - * @brief A wx widget to view `thumbnails' of a Film. + * @brief FilmViewer class. */ #include "lib/film.h" #include "lib/config.h" +#include "lib/player_text.h" +#include "lib/timer.h" #include #include @@ -34,88 +36,115 @@ class RGBPlusAlphaImage; class PlayerVideo; class Player; 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 panel showing the film's video */ + wxPanel* panel () const { + return _panel; + } + + 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 (); + bool playing () const { + return _playing; + } - void set_position (DCPTime 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 refresh (); + void slow_refresh (); + + int dropped () const { + return _dropped; + } int audio_callback (void* out, unsigned int frames); +#ifdef DCPOMATIC_VARIANT_SWAROOP + void set_background_image (bool b) { + _background_image = b; + refresh_panel (); + } +#endif + + StateTimer const & state_timer () const { + return _state_timer; + } + + int gets () const { + return _gets; + } + 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 update_slider); - void play_clicked (); void timer (); void calculate_sizes (); - void check_play_state (); - void active_jobs_changed (boost::optional); - void back_clicked (wxMouseEvent &); - void forward_clicked (wxMouseEvent &); - void player_changed (bool); - void update_position_label (); - void update_position_slider (); + void player_change (ChangeType type, int, bool); void get (); - void seek (DCPTime t, bool accurate); - void refresh_panel (); - void setup_sensitivity (); - void film_changed (Film::Property); - DCPTime nudge_amount (wxMouseEvent &); - void timecode_clicked (); - void frame_number_clicked (); - void go_to (DCPTime t); - void jump_to_selected_clicked (); + void display_player_video (); + void film_change (ChangeType, Film::Property); void recreate_butler (); void config_changed (Config::Property); - DCPTime time () const; - void start (); - bool stop (); + bool maybe_draw_background_image (wxPaintDC& dc); + + dcpomatic::DCPTime 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; - wxSizer* _v_sizer; /** The area that we put our image in */ wxPanel* _panel; - wxCheckBox* _outline_content; - wxRadioButton* _left_eye; - wxRadioButton* _right_eye; - wxCheckBox* _jump_to_selected; - wxSlider* _slider; - wxButton* _back_button; - wxButton* _forward_button; - wxStaticText* _frame_number; - wxStaticText* _timecode; - wxToggleButton* _play_button; wxTimer _timer; bool _coalesce_player_changes; - bool _pending_player_change; + std::list _pending_player_changes; + std::pair, dcpomatic::DCPTime> _player_video; boost::shared_ptr _frame; - DCPTime _video_position; + dcpomatic::DCPTime _video_position; Position _inter_position; dcp::Size _inter_size; @@ -123,11 +152,6 @@ private: dcp::Size _out_size; /** Size of the panel that we have available */ dcp::Size _panel_size; - /** true if the last call to Player::seek() was specified to be accurate; - * this is used so that when re-fetching the current frame we - * can get the same one that we got last time. - */ - bool _last_seek_accurate; RtAudio _audio; int _audio_channels; @@ -135,10 +159,32 @@ private: bool _playing; boost::shared_ptr _butler; - std::list _latency_history; - /** Mutex to protect _latency_history */ - mutable boost::mutex _latency_history_mutex; - int _latency_history_count; + std::list _latency_history; + /** Mutex to protect _latency_history */ + 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; + /** 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 + + StateTimer _state_timer; + int _gets; boost::signals2::scoped_connection _config_changed_connection; };