projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const correctness.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index c3fee45b47bb17f84c5f25414d1852680886a9ce..2793bd62a9e70583b5961f08506fa05f08e2d017 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)
{
bool
have_video (shared_ptr<const Content> content)
{
@@
-171,8
+163,10
@@
have_audio (shared_ptr<const Content> content)
void
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;
_playback_length = _playlist ? _playlist->length(_film) : _film->length();
auto old_pieces = _pieces;
@@
-1427,7
+1421,7
@@
Player::set_dcp_decode_reduction (optional<int> reduction)
optional<DCPTime>
optional<DCPTime>
-Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t)
+Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t)
const
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
@@
-1443,7
+1437,7
@@
Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t)
optional<ContentTime>
optional<ContentTime>
-Player::dcp_to_content_time (shared_ptr<const Content> content, DCPTime t)
+Player::dcp_to_content_time (shared_ptr<const Content> content, DCPTime t)
const
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);