#include "video_content.h"
#include "ffmpeg_decoder.h"
#include "ffmpeg_content.h"
-#include "imagemagick_decoder.h"
-#include "imagemagick_content.h"
+#include "still_image_decoder.h"
+#include "still_image_content.h"
+#include "content_factory.h"
#include "job.h"
#include "config.h"
#include "util.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)
{
}
-Playlist::Playlist (shared_ptr<const Playlist> other)
- : _loop (other->_loop)
-{
- for (ContentList::const_iterator i = other->_content.begin(); i != other->_content.end(); ++i) {
- _content.push_back ((*i)->clone ());
- }
-}
-
Playlist::~Playlist ()
{
_content.clear ();
}
void
-Playlist::content_changed (weak_ptr<Content> c, int p)
+Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
{
- if (p == ContentProperty::LENGTH && _sequence_video && !_sequencing_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) {
- if (!dynamic_pointer_cast<VideoContent> (*i)) {
- continue;
- }
+ if (property == ContentProperty::LENGTH) {
+ maybe_sequence_video ();
+ }
+
+ ContentChanged (content, property, frequent);
+}
- (*i)->set_start (last);
- last = (*i)->end ();
+void
+Playlist::maybe_sequence_video ()
+{
+ if (!_sequence_video || _sequencing_video) {
+ return;
+ }
+
+ _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) {
+ if (!dynamic_pointer_cast<VideoContent> (*i)) {
+ continue;
}
-
- _sequencing_video = false;
+
+ (*i)->set_position (last);
+ last = (*i)->end ();
}
- ContentChanged (c, p);
+ _sequencing_video = false;
}
string
}
}
- t += lexical_cast<string> (_loop);
-
return md5_digest (t.c_str(), t.length());
}
{
list<shared_ptr<cxml::Node> > c = node->node_children ("Content");
for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
- string const type = (*i)->string_child ("Type");
-
- boost::shared_ptr<Content> content;
-
- if (type == "FFmpeg") {
- content.reset (new FFmpegContent (film, *i));
- } else if (type == "ImageMagick") {
- content.reset (new ImageMagickContent (film, *i));
- } else if (type == "Sndfile") {
- content.reset (new SndfileContent (film, *i));
- }
-
- _content.push_back (content);
+ _content.push_back (content_factory (film, *i));
}
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
}
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);
+ }
+ }
+
Changed ();
}
candidates.push_back (FrameRateCandidate (float (*i) * 2, *i));
}
- /* Pick the best one, bailing early if we hit an exact match */
+ /* Pick the best one */
float error = std::numeric_limits<float>::max ();
optional<FrameRateCandidate> best;
list<FrameRateCandidate>::iterator i = candidates.begin();
continue;
}
- this_error += fabs (i->source - vc->video_frame_rate ());
+ /* Use the largest difference between DCP and source as the "error" */
+ this_error = max (this_error, float (fabs (i->source - vc->video_frame_rate ())));
}
if (this_error < error) {
_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)));
+ _content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3)));
}
}
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 */
+ContentList
+Playlist::content () const
+{
+ return _content;
+}
+
+void
+Playlist::repeat (ContentList c, int n)
+{
+ pair<Time, Time> 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 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_position (pos + copy->position() - range.first);
+ _content.push_back (copy);
+ }
+ pos += range.second - range.first;
+ }
+
+ reconnect ();
+ Changed ();
}