diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-23 01:52:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-23 01:52:21 +0100 |
| commit | 6516fb170b0e7a83c582a858fb54d1f83f751cc0 (patch) | |
| tree | 2182093659f83d482352e844c2170dd3c550a15a /src/wx/gl_video_view.cc | |
| parent | e026ba2c11f16fe2d486acdd489050538e66fece (diff) | |
Various tweaks to fix playback at the end of a film (#1858).
The most questionable change here is probably how
SimpleVideoView::display_next_frame no longer re-schedules
itself if the call to get_next_frame returned AGAIN; it seems
wrong to do that when FilmViewer::idle_handler() also reschedules
itself when display_next_frame() returns AGAIN.
Diffstat (limited to 'src/wx/gl_video_view.cc')
| -rw-r--r-- | src/wx/gl_video_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index e7125501e..0d79a7562 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -405,14 +405,16 @@ catch (boost::thread_interrupted& e) store_current (); } -bool + +VideoView::NextFrameResult 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; } + void GLVideoView::request_one_shot () { |