summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-09 13:53:18 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-09 13:53:18 +0100
commit3c2e80996f01740175faca63583f4dff33586be1 (patch)
tree209682e20b54c15fdb4ba1a2b56e510a65666a72 /src
parentf6e5596160d68802b7bb75d987cb99e3290df4c3 (diff)
Some small C++11 tweaks.
Diffstat (limited to 'src')
-rw-r--r--src/wx/video_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 3e21e709d..68a15e2e0 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -62,7 +62,7 @@ VideoView::get_next_frame (bool non_blocking)
return FAIL;
}
- shared_ptr<Butler> butler = _viewer->butler ();
+ auto butler = _viewer->butler ();
if (!butler) {
return FAIL;
}
@@ -72,7 +72,7 @@ VideoView::get_next_frame (bool non_blocking)
do {
Butler::Error e;
- pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
+ auto pv = butler->get_video (!non_blocking, &e);
if (e.code == Butler::Error::DIED) {
LOG_ERROR ("Butler died with %1", e.summary());
}