projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f6e5596
)
Some small C++11 tweaks.
author
Carl Hetherington
<cth@carlh.net>
Tue, 9 Feb 2021 12:53:18 +0000
(13:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 9 Feb 2021 12:53:18 +0000
(13:53 +0100)
src/wx/video_view.cc
patch
|
blob
|
history
diff --git
a/src/wx/video_view.cc
b/src/wx/video_view.cc
index 3e21e709dd2b5fc1749540ed9c4087d5aeddb20c..68a15e2e0dfc2663d4a6f14d624278a05315378e 100644
(file)
--- 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());
}