summaryrefslogtreecommitdiff
path: root/src/wx/controls.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-05 23:01:24 +0100
committerCarl Hetherington <cth@carlh.net>2019-11-05 23:02:59 +0100
commitc8db1d4012217ec295d2a77581cf0661543dc9af (patch)
treebed786f0081355324736ec07ea6bb7106ea3a909 /src/wx/controls.cc
parent25db72d238179045bf5dcc3dbe87658dd3609d52 (diff)
Differentiate between stop and suspend in player.
This and the previous commit somewhat improve the previously terrible behaviour when seeking during playback, probably introduced by the idle update stuff.
Diffstat (limited to 'src/wx/controls.cc')
-rw-r--r--src/wx/controls.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 7cd31634d..a3360b262 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -59,7 +59,6 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
, _viewer (viewer)
, _slider_being_moved (false)
- , _was_running_before_slider (false)
, _outline_content (0)
, _eye (0)
, _jump_to_selected (0)
@@ -203,7 +202,7 @@ Controls::slider_moved (bool page)
if (!page && !_slider_being_moved) {
/* This is the first event of a drag; stop playback for the duration of the drag */
- _was_running_before_slider = _viewer->stop ();
+ _viewer->suspend ();
_slider_being_moved = true;
}
@@ -230,10 +229,8 @@ Controls::slider_moved (bool page)
void
Controls::slider_released ()
{
- if (_was_running_before_slider) {
- /* Restart after a drag */
- _viewer->start ();
- }
+ /* Restart after a drag */
+ _viewer->resume ();
_slider_being_moved = false;
}