#include "video_content.h"
#include "ffmpeg_decoder.h"
#include "ffmpeg_content.h"
-#include "imagemagick_decoder.h"
-#include "imagemagick_content.h"
+#include "image_decoder.h"
#include "content_factory.h"
#include "job.h"
#include "config.h"
using std::max;
using std::string;
using std::stringstream;
+using std::pair;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::lexical_cast;
Playlist::Playlist ()
- : _loop (1)
- , _sequence_video (true)
+ : _sequence_video (true)
, _sequencing_video (false)
{
ContentChanged (content, property, frequent);
}
-
void
Playlist::maybe_sequence_video ()
{
_sequencing_video = true;
ContentList cl = _content;
- sort (cl.begin(), cl.end(), ContentSorter ());
- Time last = 0;
- for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) {
+ DCPTime next = 0;
+ for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
if (!dynamic_pointer_cast<VideoContent> (*i)) {
continue;
}
- (*i)->set_start (last);
- last = (*i)->end ();
+ (*i)->set_position (next);
+ next = (*i)->end() + 1;
}
+
+ /* This won't change order, so it does not need a sort */
_sequencing_video = false;
}
}
}
- t += lexical_cast<string> (_loop);
-
return md5_digest (t.c_str(), t.length());
}
/** @param node <Playlist> node */
void
-Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node)
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
{
- list<shared_ptr<cxml::Node> > c = node->node_children ("Content");
- for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
- _content.push_back (content_factory (film, *i));
+ list<cxml::NodePtr> c = node->node_children ("Content");
+ for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
+ _content.push_back (content_factory (film, *i, version));
}
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
reconnect ();
- _loop = node->number_child<int> ("Loop");
- _sequence_video = node->bool_child ("SequenceVideo");
}
/** @param node <Playlist> node */
for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
(*i)->as_xml (node->add_child ("Content"));
}
-
- node->add_child("Loop")->add_child_text(lexical_cast<string> (_loop));
- node->add_child("SequenceVideo")->add_child_text(_sequence_video ? "1" : "0");
}
void
Playlist::add (shared_ptr<Content> c)
{
_content.push_back (c);
+ sort (_content.begin(), _content.end(), ContentSorter ());
reconnect ();
Changed ();
}
_content.erase (i);
Changed ();
}
+
+ /* This won't change order, so it does not need a sort */
}
void
-Playlist::set_loop (int l)
+Playlist::remove (ContentList c)
{
- _loop = l;
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ ContentList::iterator j = _content.begin ();
+ 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 ();
}
return best->dcp;
}
-Time
-Playlist::length_without_loop () const
+DCPTime
+Playlist::length () const
{
- Time len = 0;
+ DCPTime len = 0;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
- len = max (len, (*i)->end ());
+ len = max (len, (*i)->end() + 1);
}
return len;
}
-Time
-Playlist::length_with_loop () const
-{
- return length_without_loop() * _loop;
-}
-
void
Playlist::reconnect ()
{
}
}
-Time
+DCPTime
Playlist::video_end () const
{
- Time end = 0;
+ DCPTime end = 0;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
if (dynamic_pointer_cast<const VideoContent> (*i)) {
end = max (end, (*i)->end ());
return end;
}
+FrameRateChange
+Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
+{
+ for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+ shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+ if (!vc) {
+ break;
+ }
+
+ if (vc->position() >= t && t < vc->end()) {
+ return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
+ }
+ }
+
+ return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
+}
+
void
Playlist::set_sequence_video (bool s)
{
bool
ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
{
- return a->start() < b->start();
+ return a->position() < b->position();
}
-/** @return content in an undefined order, not taking looping into account */
-Playlist::ContentList
-Playlist::content_without_loop () const
+/** @return content in an undefined order */
+ContentList
+Playlist::content () const
{
return _content;
}
-/** @return content in an undefined order, taking looping into account */
-Playlist::ContentList
-Playlist::content_with_loop () const
+void
+Playlist::repeat (ContentList c, int n)
{
- ContentList looped = _content;
- Time const length = length_without_loop ();
+ pair<DCPTime, DCPTime> range (TIME_MAX, 0);
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ range.first = min (range.first, (*i)->position ());
+ range.second = max (range.second, (*i)->position ());
+ range.first = min (range.first, (*i)->end ());
+ range.second = max (range.second, (*i)->end ());
+ }
- Time offset = length;
- for (int i = 1; i < _loop; ++i) {
- for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+ DCPTime pos = range.second;
+ for (int i = 0; i < n; ++i) {
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
shared_ptr<Content> copy = (*i)->clone ();
- copy->set_start (copy->start() + offset);
- looped.push_back (copy);
+ copy->set_position (pos + copy->position() - range.first);
+ _content.push_back (copy);
}
- offset += length;
+ pos += range.second - range.first;
}
+
+ sort (_content.begin(), _content.end(), ContentSorter ());
- return looped;
+ reconnect ();
+ Changed ();
+}
+
+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) {
+ previous = i;
+ ++i;
+ }
+
+ assert (i != _content.end ());
+ if (previous == _content.end ()) {
+ return;
+ }
+
+ DCPTime const p = (*previous)->position ();
+ (*previous)->set_position (p + c->length_after_trim ());
+ c->set_position (p);
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
+ Changed ();
+}
+
+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;
+ }
+
+ assert (i != _content.end ());
+
+ ContentList::iterator next = i;
+ ++next;
+
+ if (next == _content.end ()) {
+ return;
+ }
+
+ DCPTime const p = (*next)->position ();
+ (*next)->set_position (c->position ());
+ c->set_position (p + c->length_after_trim ());
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
+ Changed ();
}