Merge branch '1.0-alt-loop' into 1.0

[dcpomatic.git] / src / lib / playlist.cc

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 028b2b880bea67b3dfa64d3f32bba1157b3dc157..e4494acb052b74f6ef545dcf8568a290a1918137 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -28,6 +28,7 @@
 #include "ffmpeg_content.h"
 #include "imagemagick_decoder.h"
 #include "imagemagick_content.h"
+#include "content_factory.h"
 #include "job.h"
 #include "config.h"
 #include "util.h"
@@ -41,6 +42,7 @@ using std::min;
 using std::max;
 using std::string;
 using std::stringstream;
+using std::pair;
 using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
@@ -48,21 +50,12 @@ using boost::dynamic_pointer_cast;
 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 ();
@@ -70,28 +63,21 @@ Playlist::~Playlist ()
 }
 
 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) {
+       if (property == ContentProperty::LENGTH) {
                maybe_sequence_video ();
        }
-<<<<<<< HEAD
        
-       ContentChanged (c, p);
+       ContentChanged (content, property, frequent);
 }
 
-=======
-
-       ContentChanged (c, p);
-}
 
->>>>>>> 1ea6a456bc2b4a695f6db4720353c35167597b30
 void
 Playlist::maybe_sequence_video ()
 {
        if (!_sequence_video || _sequencing_video) {
                return;
-<<<<<<< HEAD
        }
        
        _sequencing_video = true;
@@ -108,24 +94,6 @@ Playlist::maybe_sequence_video ()
                last = (*i)->end ();
        }
        
-=======
-       }
-       
-       _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;
-               }
-               
-               (*i)->set_start (last);
-               last = (*i)->end ();
-       }
-       
->>>>>>> 1ea6a456bc2b4a695f6db4720353c35167597b30
        _sequencing_video = false;
 }
 
@@ -141,8 +109,6 @@ Playlist::video_identifier () const
                }
        }
 
-       t += lexical_cast<string> (_loop);
-
        return md5_digest (t.c_str(), t.length());
 }
 
@@ -152,23 +118,10 @@ Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node
 {
        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");
 }
 
@@ -180,7 +133,6 @@ Playlist::as_xml (xmlpp::Node* node)
                (*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");
 }
 
@@ -206,13 +158,6 @@ Playlist::remove (shared_ptr<Content> c)
        }
 }
 
-void
-Playlist::set_loop (int l)
-{
-       _loop = l;
-       Changed ();
-}
-
 bool
 Playlist::has_subtitles () const
 {
@@ -310,7 +255,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)));
+               _content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3)));
        }
 }
 
@@ -338,3 +283,35 @@ ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
 {
        return a->start() < b->start();
 }
+
+/** @return content in an undefined order */
+Playlist::ContentList
+Playlist::content () const
+{
+       return _content;
+}
+
+void
+Playlist::repeat (list<shared_ptr<Content> > c, int n)
+{
+       pair<Time, Time> range (TIME_MAX, 0);
+       for (list<shared_ptr<Content> >::iterator i = c.begin(); i != c.end(); ++i) {
+               range.first = min (range.first, (*i)->start ());
+               range.second = max (range.second, (*i)->start ());
+               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 (list<shared_ptr<Content> >::iterator i = c.begin(); i != c.end(); ++i) {
+                       shared_ptr<Content> copy = (*i)->clone ();
+                       copy->set_start (pos + copy->start() - range.first);
+                       _content.push_back (copy);
+               }
+               pos += range.second - range.first;
+       }
+
+       reconnect ();
+       Changed ();
+}