Restore up/down buttons for simple content movements.

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index c70c79972f0d44891393a7f1d49fce5cc0a67a69..1712dc8ff54dee392f5e865830aa91cea76c2cf1 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -26,8 +26,8 @@
 #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"
@@ -42,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;
@@ -71,7 +72,6 @@ Playlist::content_changed (weak_ptr<Content> content, int property, bool frequen
        ContentChanged (content, property, frequent);
 }
 
-
 void
 Playlist::maybe_sequence_video ()
 {
@@ -82,16 +82,17 @@ 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) {
+       for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
                if (!dynamic_pointer_cast<VideoContent> (*i)) {
                        continue;
                }
                
-               (*i)->set_start (last);
+               (*i)->set_position (last);
                last = (*i)->end ();
        }
+
+       /* This won't change order, so it does not need a sort */
        
        _sequencing_video = false;
 }
@@ -120,8 +121,9 @@ Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node
                _content.push_back (content_factory (film, *i));
        }
 
+       sort (_content.begin(), _content.end(), ContentSorter ());
+
        reconnect ();
-       _sequence_video = node->bool_child ("SequenceVideo");
 }
 
 /** @param node <Playlist> node */
@@ -131,14 +133,13 @@ Playlist::as_xml (xmlpp::Node* node)
        for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
                (*i)->as_xml (node->add_child ("Content"));
        }
-
-       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 ();
 }
@@ -155,6 +156,27 @@ Playlist::remove (shared_ptr<Content> c)
                _content.erase (i);
                Changed ();
        }
+
+       /* This won't change order, so it does not need a sort */
+}
+
+void
+Playlist::remove (ContentList c)
+{
+       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 ();
 }
 
 bool
@@ -280,12 +302,91 @@ 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 */
-Playlist::ContentList
+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;
+       }
+
+       sort (_content.begin(), _content.end(), ContentSorter ());
+       
+       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;
+       }
+       
+       Time 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;
+       }
+
+       Time const p = (*next)->position ();
+       (*next)->set_position (c->position ());
+       c->set_position (p + c->length_after_trim ());
+       sort (_content.begin(), _content.end(), ContentSorter ());
+       
+       Changed ();
+}