#include "lib/player_text.h"
#include "lib/timer.h"
#include "lib/signaller.h"
+#include "lib/warnings.h"
#include <RtAudio.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
class wxToggleButton;
class FFmpegPlayer;
void set_dcp_decode_reduction (boost::optional<int> reduction);
boost::optional<int> dcp_decode_reduction () const;
void set_outline_content (bool o);
+ void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
void set_eyes (Eyes e);
void set_pad_black (bool p);
void slow_refresh ();
+ dcpomatic::DCPTime time () const;
+ boost::optional<dcpomatic::DCPTime> audio_time () const;
+
int dropped () const;
+ int errored () const;
+ int gets () const;
int audio_callback (void* out, unsigned int frames);
#ifdef DCPOMATIC_VARIANT_SWAROOP
void set_background_image (bool b) {
_background_image = b;
- refresh_view ();
+ _video_view->update ();
}
bool background_image () const {
#endif
StateTimer const & state_timer () const {
- return _state_timer;
- }
-
- StateTimer& state_timer () {
- return _state_timer;
- }
-
- int gets () const {
- return _gets;
+ return _video_view->state_timer ();
}
/* 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<int> inter_position () const {
- return _inter_position;
- }
bool outline_content () const {
return _outline_content;
}
+ boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+ return _outline_subtitles;
+ }
bool pad_black () const {
return _pad_black;
}
boost::shared_ptr<Butler> butler () const {
return _butler;
}
+ ClosedCaptionsDialog* closed_captions_dialog () const {
+ return _closed_captions_dialog;
+ }
+ void finished ();
+
+ bool pending_idle_get () const {
+ return _idle_get;
+ }
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
- void emit_finished ();
boost::signals2::signal<bool ()> PlaybackPermitted;
private:
- /* XXX_b: to remove */
- friend class SimpleVideoView;
- friend class GLVideoView;
- friend class VideoView;
-
void video_view_sized ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void idle_handler ();
void request_idle_display_next_frame ();
void film_change (ChangeType, Film::Property);
+ void content_change (ChangeType, int property);
void recreate_butler ();
void config_changed (Config::Property);
void film_length_change ();
+ void ui_finished ();
- dcpomatic::DCPTime time () const;
- boost::optional<dcpomatic::DCPTime> audio_time () const;
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
- void refresh_view ();
bool quick_refresh ();
boost::shared_ptr<Film> _film;
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
- Position<int> _inter_position;
- dcp::Size _inter_size;
-
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
ClosedCaptionsDialog* _closed_captions_dialog;
bool _outline_content;
- Eyes _eyes;
+ boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
bool _background_image;
#endif
- StateTimer _state_timer;
- int _gets;
-
/** true if an get() is required next time we are idle */
bool _idle_get;