diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-23 10:42:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-08 21:56:47 +0100 |
| commit | 89e92b3e7effafd2ca3aa1e9300777f2d2fb6183 (patch) | |
| tree | bb542303b25fd0a09be1df91319beb67e1609759 /src/wx/video_view.cc | |
| parent | ac69a0eb81e23a341545e05fa12a0e26070cb222 (diff) | |
Don't busy-wait when there's nothing to play.
Diffstat (limited to 'src/wx/video_view.cc')
| -rw-r--r-- | src/wx/video_view.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc index 7f93f765e..4edc2cd23 100644 --- a/src/wx/video_view.cc +++ b/src/wx/video_view.cc @@ -22,8 +22,10 @@ #include "wx_util.h" #include "film_viewer.h" #include "lib/butler.h" +#include <boost/optional.hpp> using boost::shared_ptr; +using boost::optional; VideoView::VideoView (FilmViewer* viewer) : _viewer (viewer) @@ -89,13 +91,13 @@ VideoView::one_video_frame () const return dcpomatic::DCPTime::from_frames (1, video_frame_rate()); } -/** @return Time in ms until the next frame is due */ -int +/** @return Time in ms until the next frame is due, or empty if nothing is due */ +optional<int> VideoView::time_until_next_frame () const { if (length() == dcpomatic::DCPTime()) { /* There's no content, so this doesn't matter */ - return 0; + return optional<int>(); } dcpomatic::DCPTime const next = position() + one_video_frame(); |
