X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=8c46d51904262aab9f4598032ed344e264a5eb86;hp=0218c1fb30d198b494d05b466f778de8509324bf;hb=c68cf49367957b49a99a9cc04013e9ee5a8c5bfc;hpb=d2ce97f930b53ec7d50c22a11dd03b7264b25039 diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 0218c1fb3..8c46d5190 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -82,7 +82,7 @@ Butler::Butler ( /* The butler must hear about things first, otherwise it might not sort out suspensions in time for get_video() to be called in response to this signal. */ - _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3), boost::signals2::at_front); + _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1), boost::signals2::at_front); _thread = new boost::thread (bind (&Butler::thread, this)); #ifdef DCPOMATIC_LINUX pthread_setname_np (_thread->native_handle(), "butler"); @@ -358,7 +358,7 @@ Butler::memory_used () const } void -Butler::player_change (ChangeType type, bool frequent) +Butler::player_change (ChangeType type) { boost::mutex::scoped_lock lm (_mutex); @@ -366,7 +366,7 @@ Butler::player_change (ChangeType type, bool frequent) ++_suspended; } else if (type == CHANGE_TYPE_DONE) { --_suspended; - if (_died || _pending_seek_position || frequent) { + if (_died || _pending_seek_position) { lm.unlock (); _summon.notify_all (); return;