From: Carl Hetherington Date: Sat, 10 Sep 2022 16:32:08 +0000 (+0200) Subject: Remove now-unused setup_pieces_unlocked() X-Git-Tag: v2.16.25~1^2~5 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=64a27cef84b97edd665d4891efb8ba5c9d78b70f;hp=959034cec386965f41a781c3ae6929bf7b14318c Remove now-unused setup_pieces_unlocked() --- 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 content) { @@ -171,8 +163,10 @@ have_audio (shared_ptr 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);