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 ();
}
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);
}
- _viewer->state_timer().unset();
+ _state_timer.unset();
}
void
SimpleVideoView::update ()
{
+ _state_timer.set ("update-view");
_panel->Refresh ();
_panel->Update ();
+ _state_timer.unset ();
}
void
void
SimpleVideoView::start ()
{
+ VideoView::start ();
timer ();
}
display_player_video ();
+ try {
+ _viewer->butler()->rethrow ();
+ } catch (DecodeError& e) {
+ error_dialog (get(), e.what());
+ }
+
return true;
}
void
SimpleVideoView::display_player_video ()
{
- if (!_player_video.first) {
+ if (!player_video().first) {
set_image (shared_ptr<Image>());
_viewer->refresh_view ();
return;
}
- if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->one_video_frame()) {
+ if (_viewer->playing() && (_viewer->time() - player_video().second) > one_video_frame()) {
/* Too late; just drop this frame before we try to get its image (which will be the time-consuming
part if this frame is J2K).
*/
- ++_viewer->_dropped;
+ add_dropped ();
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), false, true)
);
- _viewer->_state_timer.set ("ImageChanged");
- _viewer->ImageChanged (_player_video.first);
- _viewer->_state_timer.unset ();
+ _state_timer.set ("ImageChanged");
+ _viewer->ImageChanged (player_video().first);
+ _state_timer.unset ();
- _viewer->_inter_position = _player_video.first->inter_position ();
- _viewer->_inter_size = _player_video.first->inter_size ();
+ _inter_position = player_video().first->inter_position ();
+ _inter_size = player_video().first->inter_size ();
_viewer->refresh_view ();
- _viewer->_closed_captions_dialog->update (_viewer->time());
+ _viewer->closed_captions_dialog()->update (_viewer->time());
}