summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-05-22 22:12:56 +0200
committerCarl Hetherington <cth@carlh.net>2021-06-28 20:43:58 +0200
commitecc74ec418e060fa163d25d08a62a6e81eece114 (patch)
tree3e3f8358723260f269cc9ff4525beaa5ee318fc3 /src/wx
parent8eaf36467713e7ba9a1a2272a44aa1581e31c1b0 (diff)
C++11 tidying.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/simple_video_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 1740e0ffd..a31d823a9 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -102,7 +102,7 @@ SimpleVideoView::paint ()
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();
+ auto subs = _viewer->outline_subtitles();
if (subs) {
wxPen p (wxColour(0, 255, 0), 2);
dc.SetPen (p);
@@ -130,7 +130,7 @@ SimpleVideoView::timer ()
}
display_next_frame (false);
- DCPTime const next = position() + _viewer->one_video_frame();
+ auto const next = position() + _viewer->one_video_frame();
if (next >= length()) {
_viewer->finished ();
@@ -160,7 +160,7 @@ SimpleVideoView::start ()
VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
- NextFrameResult const r = get_next_frame (non_blocking);
+ auto const r = get_next_frame (non_blocking);
if (r != SUCCESS) {
return r;
}