summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-09-10 18:32:08 +0200
committerCarl Hetherington <cth@carlh.net>2022-09-10 23:21:06 +0200
commit64a27cef84b97edd665d4891efb8ba5c9d78b70f (patch)
tree1ab6c38524160dba57574bbb2768c7573b942dd7 /src/lib
parent959034cec386965f41a781c3ae6929bf7b14318c (diff)
Remove now-unused setup_pieces_unlocked()
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.cc12
-rw-r--r--src/lib/player.h1
2 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index c3fee45b4..0c0c68b3a 100644
--- 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 ce8b7cc5a..e52ca3ffe 100644
--- 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);