summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-21 01:15:32 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-21 01:15:32 +0100
commite60bb3e51bd1508b149e6b8f6608f09b5196ae26 (patch)
treea7a5b937c9ae138d4eebca8d5130d308bf9ae420 /src/lib/playlist.cc
parentf07d5125a7b609320682689abe40781f096ca25e (diff)
No-op: remove all trailing whitespace.
Diffstat (limited to 'src/lib/playlist.cc')
-rw-r--r--src/lib/playlist.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 0bb339f50..c5e026699 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -67,11 +67,11 @@ Playlist::content_changed (weak_ptr<Content> content, int property, bool frequen
- any other position changes will be timeline drags which should not result in content
being sequenced.
*/
-
+
if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
maybe_sequence_video ();
}
-
+
ContentChanged (content, property, frequent);
}
@@ -81,9 +81,9 @@ Playlist::maybe_sequence_video ()
if (!_sequence_video || _sequencing_video) {
return;
}
-
+
_sequencing_video = true;
-
+
DCPTime next_left;
DCPTime next_right;
for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
@@ -91,7 +91,7 @@ Playlist::maybe_sequence_video ()
if (!vc) {
continue;
}
-
+
if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
vc->set_position (next_right);
next_right = vc->end() + DCPTime::delta ();
@@ -102,7 +102,7 @@ Playlist::maybe_sequence_video ()
}
/* This won't change order, so it does not need a sort */
-
+
_sequencing_video = false;
}
@@ -110,7 +110,7 @@ string
Playlist::video_identifier () const
{
string t;
-
+
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
if (vc) {
@@ -162,7 +162,7 @@ Playlist::remove (shared_ptr<Content> c)
while (i != _content.end() && *i != c) {
++i;
}
-
+
if (i != _content.end ()) {
_content.erase (i);
Changed ();
@@ -179,14 +179,14 @@ Playlist::remove (ContentList c)
while (j != _content.end() && *j != *i) {
++j;
}
-
+
if (j != _content.end ()) {
_content.erase (j);
}
}
/* This won't change order, so it does not need a sort */
-
+
Changed ();
}
@@ -249,7 +249,7 @@ Playlist::best_dcp_frame_rate () const
if (!best) {
return 24;
}
-
+
return best->dcp;
}
@@ -272,7 +272,7 @@ Playlist::reconnect ()
}
_content_connections.clear ();
-
+
for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
_content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3)));
}
@@ -349,7 +349,7 @@ Playlist::repeat (ContentList c, int n)
}
sort (_content.begin(), _content.end(), ContentSorter ());
-
+
reconnect ();
Changed ();
}
@@ -358,7 +358,7 @@ void
Playlist::move_earlier (shared_ptr<Content> c)
{
sort (_content.begin(), _content.end(), ContentSorter ());
-
+
ContentList::iterator previous = _content.end ();
ContentList::iterator i = _content.begin();
while (i != _content.end() && *i != c) {
@@ -371,7 +371,7 @@ Playlist::move_earlier (shared_ptr<Content> c)
return;
}
-
+
DCPTime const p = (*previous)->position ();
(*previous)->set_position (p + c->length_after_trim ());
c->set_position (p);
@@ -382,7 +382,7 @@ void
Playlist::move_later (shared_ptr<Content> c)
{
sort (_content.begin(), _content.end(), ContentSorter ());
-
+
ContentList::iterator i = _content.begin();
while (i != _content.end() && *i != c) {
++i;