projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
gl_video_view.cc
diff --git
a/src/wx/gl_video_view.cc
b/src/wx/gl_video_view.cc
index e7125501eb469677d5061cac0310f074d7dc4d3b..969264c2710d5656a22303c07c5b38f69660b23b 100644
(file)
--- a/
src/wx/gl_video_view.cc
+++ b/
src/wx/gl_video_view.cc
@@
-49,7
+49,7
@@
#endif
using std::cout;
#endif
using std::cout;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
@@
-405,14
+405,16
@@
catch (boost::thread_interrupted& e)
store_current ();
}
store_current ();
}
-bool
+
+VideoView::NextFrameResult
GLVideoView::display_next_frame (bool non_blocking)
{
GLVideoView::display_next_frame (bool non_blocking)
{
-
bool
const r = get_next_frame (non_blocking);
+
NextFrameResult
const r = get_next_frame (non_blocking);
request_one_shot ();
return r;
}
request_one_shot ();
return r;
}
+
void
GLVideoView::request_one_shot ()
{
void
GLVideoView::request_one_shot ()
{