X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=64ac885e37bdcbe73b0637332c8a2007c28534be;hb=b5a748e1709404e16c30a7a49ae35809555539db;hp=385f6142becb1f43e77ed30af41b81e15b1d26b6;hpb=dffc146e5387a0b3f7a671d845d6c3051b0e7067;p=dcpomatic.git diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 385f6142b..64ac885e3 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-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,14 +18,25 @@ */ + /** @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 "lib/signaller.h" +#include "lib/warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS +#include + class wxToggleButton; class FFmpegPlayer; @@ -34,131 +45,166 @@ 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 Signaller { public: - FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true); + FilmViewer (wxWindow *); ~FilmViewer (); - void set_film (boost::shared_ptr); - boost::shared_ptr film () const { + /** @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 (std::shared_ptr); + std::shared_ptr film () const { return _film; } + 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(); + } + 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_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 (); - bool quick_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); + + StateTimer const & state_timer () const { + return _video_view->state_timer (); } - void start (); - bool stop (); - bool playing () const { - return _playing; + /* 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); - void back_frame (); - void forward_frame (); + bool pending_idle_get () const { + return _idle_get; + } - int audio_callback (void* out, unsigned int frames); + 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; + /** Emitted from the GUI thread when a lot of frames are being dropped */ + boost::signals2::signal TooManyDropped; - boost::signals2::signal)> ImageChanged; + 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 (); + + 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_changed (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 player_change (ChangeType type, int, bool); + void player_change (std::vector properties); + void idle_handler (); + void request_idle_display_next_frame (); + void film_change (ChangeType, Film::Property); void recreate_butler (); void config_changed (Config::Property); - DCPTime time () const; + void film_length_change (); + void ui_finished (); + void start_audio_stream_if_open (); + + dcpomatic::DCPTime uncorrected_time () const; Frame average_latency () const; - DCPTime one_video_frame () const; - - 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; - 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; - 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; + + bool quick_refresh (); + + std::shared_ptr _film; + std::shared_ptr _player; + + 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; + /** 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; + + /** true if an get() is required next time we are idle */ + bool _idle_get = false; + boost::signals2::scoped_connection _config_changed_connection; };