projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5eb8b5c
)
Hack around changes in main branch with respect to suspend/resume.
author
Carl Hetherington
<cth@carlh.net>
Tue, 5 Nov 2019 22:26:22 +0000
(23:26 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 8 Jan 2020 20:56:47 +0000
(21:56 +0100)
src/wx/film_viewer.cc
patch
|
blob
|
history
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 373e6d717246d956f982242d83103ce1cbc405fb..dc6ed10c4d0616fbb6c2bb15e0f40deb093f6a32 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-306,7
+306,7
@@
FilmViewer::resume ()
_audio.setStreamTime (_video_position.seconds());
_audio.startStream ();
}
-
timer
();
+
_video_view->start
();
}
}
@@
-461,9
+461,6
@@
FilmViewer::seek (DCPTime t, bool accurate)
if (!_playing) {
request_idle_get ();
- } else {
- /* Make sure we get a frame so that _video_position is set up before we resume */
- while (!get(true)) {}
}
resume ();