X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=aea3f8c8633465933af11c5e5ccad26610d87d4d;hb=4621a56be32a44e83b89ec0af77ab899fa86defd;hp=8024bb1bfc16ff9020b5596e057c1dbd0b9fb3df;hpb=09606d58511bddc4c1abe3f2dff1a8eaff13a991;p=dcpomatic.git diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 8024bb1bf..aea3f8c86 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -25,27 +25,27 @@ #include "video_view.h" -#include "lib/film.h" #include "lib/config.h" +#include "lib/film.h" #include "lib/player_text.h" -#include "lib/timer.h" #include "lib/signaller.h" -#include "lib/warnings.h" +#include "lib/timer.h" +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include -class wxToggleButton; +class Butler; +class ClosedCaptionsDialog; class FFmpegPlayer; class Image; -class RGBPlusAlphaImage; -class PlayerVideo; class Player; -class Butler; -class ClosedCaptionsDialog; +class PlayerVideo; +class RGBPlusAlphaImage; +class wxToggleButton; /** @class FilmViewer @@ -62,7 +62,7 @@ public: return _video_view->get(); } - VideoView const * video_view () const { + std::shared_ptr video_view () const { return _video_view; } @@ -80,6 +80,7 @@ public: dcpomatic::DCPTime position () const { return _video_view->position(); } + boost::optional position_in_content (std::shared_ptr content) const; dcpomatic::DCPTime one_video_frame () const; void start (); @@ -95,9 +96,12 @@ 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_outline_subtitles (boost::optional>); void set_eyes (Eyes e); void set_pad_black (bool p); + void set_optimise_for_j2k (bool o); + void set_crop_guess (dcpomatic::Rect crop); + void unset_crop_guess (); void slow_refresh (); @@ -115,13 +119,10 @@ public: } /* 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 { + boost::optional> outline_subtitles () const { return _outline_subtitles; } bool pad_black () const { @@ -135,16 +136,21 @@ public: } void finished (); void image_changed (std::shared_ptr video); + boost::optional> crop_guess () const { + return _crop_guess; + } bool pending_idle_get () const { return _idle_get; } boost::signals2::signal)> ImageChanged; - 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; + /** Emitted from the GUI thread when a lot of frames are being dropped */ + boost::signals2::signal TooManyDropped; boost::signals2::signal PlaybackPermitted; @@ -157,10 +163,13 @@ private: void idle_handler (); void request_idle_display_next_frame (); void film_change (ChangeType, Film::Property); - void recreate_butler (); + void destroy_butler(); + void create_butler(); + void destroy_and_maybe_create_butler(); void config_changed (Config::Property); void film_length_change (); void ui_finished (); + void start_audio_stream_if_open (); dcpomatic::DCPTime uncorrected_time () const; Frame average_latency () const; @@ -168,40 +177,44 @@ private: bool quick_refresh (); std::shared_ptr _film; - std::shared_ptr _player; + boost::optional _player; - VideoView* _video_view; - bool _coalesce_player_changes; + std::shared_ptr _video_view; + bool _coalesce_player_changes = false; std::vector _pending_player_changes; - /** Size of our output (including padding if we have any) */ - dcp::Size _out_size; - RtAudio _audio; - int _audio_channels; - unsigned int _audio_block_size; - bool _playing; - int _suspended; + 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; boost::optional _dcp_decode_reduction; - ClosedCaptionsDialog* _closed_captions_dialog; + /** true to assume that this viewer is only being used for JPEG2000 sources + * so it can optimise accordingly. + */ + bool _optimise_for_j2k = false; - bool _outline_content; - boost::optional > _outline_subtitles; + 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; + bool _pad_black = false; /** true if an get() is required next time we are idle */ - bool _idle_get; + bool _idle_get = false; + + boost::optional> _crop_guess; boost::signals2::scoped_connection _config_changed_connection; };