X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=a3360b262c29beb0856c492052793f65be5df307;hb=4cb18d1e0b8fdedf6bb38e1d4187a2d782957022;hp=473ad8cb343e40ab1413f570dfdf3df8172b0185;hpb=d5c8fb9b826aaac2acab58f8a7b2eec4fcce99a6;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 473ad8cb3..a3360b262 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -52,13 +52,13 @@ using boost::optional; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using namespace dcpomatic; Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor_controls) : wxPanel (parent) , _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) @@ -202,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; } @@ -229,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; }