summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-08-24 22:54:11 +0200
committerCarl Hetherington <cth@carlh.net>2020-08-24 22:54:11 +0200
commitbb0bf599e9d114246fac113442391cfd890a2836 (patch)
tree90bc1de94bdaf343661bff6e365b9e5fcdd97ede /src/lib/player.cc
parentf07aadd69c58fef14f36c9a844f7834c93b4a7de (diff)
Add Player::set_always_trim.cpl-trim
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 57fc7a67c..a940b42b8 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -97,6 +97,7 @@ Player::Player (shared_ptr<const Film> film)
, _fast (false)
, _tolerant (film->tolerant())
, _play_referenced (false)
+ , _always_trim (false)
, _audio_merger (_film->audio_frame_rate())
, _shuffler (0)
{
@@ -114,6 +115,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
, _fast (false)
, _tolerant (film->tolerant())
, _play_referenced (false)
+ , _always_trim (false)
, _audio_merger (_film->audio_frame_rate())
, _shuffler (0)
{
@@ -504,6 +506,16 @@ Player::set_play_referenced ()
setup_pieces_unlocked ();
}
+
+void
+Player::set_always_trim ()
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ _always_trim = true;
+ setup_pieces_unlocked ();
+}
+
+
static void
maybe_add_asset (list<ReferencedReelAsset>& a, shared_ptr<dcp::ReelAsset> r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr)
{