* @brief FilmViewer class.
*/
+#include "video_view.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/player_text.h"
FilmViewer (wxWindow *);
~FilmViewer ();
- /** @return the panel showing the film's video */
- wxPanel* panel () const {
- return _panel;
+ /** @return the window showing the film's video */
+ wxWindow* panel () const {
+ return _video_view->get();
}
void show_closed_captions ();
#ifdef DCPOMATIC_VARIANT_SWAROOP
void set_background_image (bool b) {
_background_image = b;
- refresh_panel ();
+ refresh_view ();
+ }
+
+ bool background_image () const {
+ return _background_image;
}
#endif
return _state_timer;
}
+ StateTimer& state_timer () {
+ return _state_timer;
+ }
+
int gets () const {
return _gets;
}
+ /* Some accessors 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;
+ }
+ bool pad_black () const {
+ return _pad_black;
+ }
+ dcpomatic::DCPTime video_position () const {
+ return _video_position;
+ }
+
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void ()> PositionChanged;
boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
boost::signals2::signal<bool ()> PlaybackPermitted;
private:
- void paint_panel ();
- void panel_sized (wxSizeEvent &);
+ void video_view_sized ();
void timer ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void film_change (ChangeType, Film::Property);
void recreate_butler ();
void config_changed (Config::Property);
- bool maybe_draw_background_image (wxPaintDC& dc);
dcpomatic::DCPTime time () const;
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
- void refresh_panel ();
+ void refresh_view ();
bool quick_refresh ();
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
- /** The area that we put our image in */
- wxPanel* _panel;
+ VideoView* _video_view;
wxTimer _timer;
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
- boost::shared_ptr<const Image> _frame;
dcpomatic::DCPTime _video_position;
Position<int> _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;
bool _pad_black;
#ifdef DCPOMATIC_VARIANT_SWAROOP
- bool _in_watermark;
- int _watermark_x;
- int _watermark_y;
bool _background_image;
#endif