Remove now-unused setup_pieces_unlocked()

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c3fee45b47bb17f84c5f25414d1852680886a9ce..0c0c68b3a502ac4bf0f36aece900a57cc8010f04 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -148,14 +148,6 @@ Player::construct ()
 }
 
 
-void
-Player::setup_pieces ()
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       setup_pieces_unlocked ();
-}
-
-
 bool
 have_video (shared_ptr<const Content> content)
 {
@@ -171,8 +163,10 @@ have_audio (shared_ptr<const Content> content)
 
 
 void
-Player::setup_pieces_unlocked ()
+Player::setup_pieces ()
 {
+       boost::mutex::scoped_lock lm (_mutex);
+
        _playback_length = _playlist ? _playlist->length(_film) : _film->length();
 
        auto old_pieces = _pieces;

diff --git a/src/lib/player.h b/src/lib/player.h
index ce8b7cc5a53894fcc6d727d5ae790f393c0417f9..e52ca3ffee2e5bc463f923bec9c1cb9f9cd31019 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -126,7 +126,6 @@ private:
 
        void construct ();
        void setup_pieces ();
-       void setup_pieces_unlocked ();
        void film_change (ChangeType, Film::Property);
        void playlist_change (ChangeType);
        void playlist_content_change (ChangeType, int, bool);