Restore paint-panel timing.

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index b897282d9b697b1d8b8ebd64d7f933beb7907775..450111bc4e6b96c6b765f8841c04cd34099f6664 100644 (file)
--- 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 39d418cbfc3d2af18baa8b31c99092e6af280e98..39532ab79b90990900b4c619b9b0daf55ab3e6ee 100644 (file)
--- 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 524106b6769fd2f7be9b89647d3439d86fbb94e0..0a0fce277f9b05c05fc2d5e2e9ec2e49882e4da9 100644 (file)
--- 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