diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-12 21:19:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-12 21:19:59 +0100 |
| commit | e9e8951e0961564121f9c6cc4ce87555eebf9ec8 (patch) | |
| tree | 1b9092afb6fae122d62e17bbbf611ff568e76fc1 /src | |
| parent | 1e2ff3aad2e6feabc7d725f64e41feb0b5ba9439 (diff) | |
Restore paint-panel timing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_viewer.h | 4 | ||||
| -rw-r--r-- | src/wx/gl_video_view.cc | 2 | ||||
| -rw-r--r-- | src/wx/simple_video_view.cc | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index b897282d9..450111bc4 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -101,6 +101,10 @@ public: return _state_timer; } + StateTimer& state_timer () { + return _state_timer; + } + int gets () const { return _gets; } diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 39d418cbf..39532ab79 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -69,9 +69,11 @@ static void void GLVideoView::paint () { + _viewer->state_timer().set("paint-panel"); _canvas->SetCurrent (*_context); wxPaintDC dc (_canvas); draw (); + _viewer->state_timer().unset(); } void diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 524106b67..0a0fce277 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -46,6 +46,7 @@ SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent) void SimpleVideoView::paint () { + _viewer->state_timer().set("paint-panel"); wxPaintDC dc (_panel); #ifdef DCPOMATIC_VARIANT_SWAROOP @@ -117,6 +118,7 @@ SimpleVideoView::paint () 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); } + _viewer->state_timer().unset(); } void |