using std::string;
using boost::optional;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
+
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
: VideoView (viewer)
{
void
SimpleVideoView::paint ()
{
- _viewer->state_timer().set("paint-panel");
+ _state_timer.set("paint-panel");
wxPaintDC dc (_panel);
dcp::Size const out_size = _viewer->out_size ();
#ifdef DCPOMATIC_VARIANT_SWAROOP
DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
- int64_t n = _viewer->position().get() / period.get();
+ int64_t n = position().get() / period.get();
DCPTime from(n * period.get());
DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
- if (from <= _viewer->position() && _viewer->position() <= to) {
+ if (from <= position() && position() <= to) {
if (!_in_watermark) {
_in_watermark = true;
_watermark_x = rand() % panel_size.GetWidth();
}
if (_viewer->outline_content()) {
- Position<int> inter_position = _viewer->inter_position ();
- dcp::Size inter_size = _viewer->inter_size ();
wxPen p (wxColour (255, 0, 0), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle (inter_position.x, inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+ dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
+ }
+
+ optional<dcpomatic::Rect<double> > subs = _viewer->outline_subtitles();
+ if (subs) {
+ wxPen p (wxColour(0, 255, 0), 2);
+ dc.SetPen (p);
+ dc.SetBrush (*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
}
- _viewer->state_timer().unset();
+
+ _state_timer.unset();
}
void
-SimpleVideoView::update ()
+SimpleVideoView::refresh_panel ()
{
+ _state_timer.set ("refresh-panel");
_panel->Refresh ();
_panel->Update ();
+ _state_timer.unset ();
}
void
}
display_next_frame (false);
- DCPTime const next = _viewer->position() + _viewer->one_video_frame();
+ DCPTime const next = position() + _viewer->one_video_frame();
if (next >= length()) {
- _viewer->stop ();
- _viewer->Finished ();
+ _viewer->finished ();
return;
}
- LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
- _timer.Start (time_until_next_frame(), wxTIMER_ONE_SHOT);
+ LOG_DEBUG_VIDEO_VIEW("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
+ _timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
if (_viewer->butler()) {
_viewer->butler()->rethrow ();
}
}
- display_player_video ();
+ update ();
try {
_viewer->butler()->rethrow ();
}
void
-SimpleVideoView::display_player_video ()
+SimpleVideoView::update ()
{
if (!player_video().first) {
set_image (shared_ptr<Image>());
- _viewer->refresh_view ();
+ refresh_panel ();
return;
}
* image and convert it (from whatever the user has said it is) to RGB.
*/
- _viewer->_state_timer.set ("get image");
+ _state_timer.set ("get image");
set_image (
- player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+ player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)
);
- _viewer->_state_timer.set ("ImageChanged");
- _viewer->ImageChanged (player_video().first);
- _viewer->_state_timer.unset ();
-
- _viewer->_inter_position = player_video().first->inter_position ();
- _viewer->_inter_size = player_video().first->inter_size ();
+ _state_timer.set ("ImageChanged");
+ _viewer->image_changed (player_video().first);
+ _state_timer.unset ();
- _viewer->refresh_view ();
+ _inter_position = player_video().first->inter_position ();
+ _inter_size = player_video().first->inter_size ();
- _viewer->_closed_captions_dialog->update (_viewer->time());
+ refresh_panel ();
}