X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=6789d74a5b925858caa234600fd734dfd7e1100b;hb=b733ff51f0212d02dbf33ccb62e67f07941f5ace;hp=882d8bf580d54d32d01f6a53730ff52b57543207;hpb=6b9bda07984837d188064f3f5514d0aa132655ec;p=dcpomatic.git diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 882d8bf58..6789d74a5 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -64,7 +64,7 @@ Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping aud _player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2)); _player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2)); _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3)); - _player_changed_connection = _player->Changed.connect (bind (&Butler::player_changed, this)); + _player_changed_connection = _player->Changed.connect (bind (&Butler::player_changed, this, _2)); _thread = new boost::thread (bind (&Butler::thread, this)); #ifdef DCPOMATIC_LINUX pthread_setname_np (_thread->native_handle(), "butler"); @@ -309,10 +309,10 @@ Butler::memory_used () const } void -Butler::player_changed () +Butler::player_changed (bool frequent) { boost::mutex::scoped_lock lm (_mutex); - if (_died || _pending_seek_position) { + if (_died || _pending_seek_position || frequent) { return; }