Don't overlap simultaneous video content in the timeline. Fix keep-aligned for separ...

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index c54b24c1c947e3bc78c134c74fc36f0e30468ee5..a2bec83bb3266948802c14f4c9fe4436e3b4e649 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -26,8 +26,7 @@
 #include "video_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
+#include "image_decoder.h"
 #include "content_factory.h"
 #include "job.h"
 #include "config.h"
@@ -65,7 +64,7 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-       if (property == ContentProperty::LENGTH) {
+       if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
                maybe_sequence_video ();
        }
        
@@ -82,14 +81,21 @@ Playlist::maybe_sequence_video ()
        _sequencing_video = true;
        
        ContentList cl = _content;
-       Time next = 0;
+       Time next_left = 0;
+       Time next_right = 0;
        for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-               if (!dynamic_pointer_cast<VideoContent> (*i)) {
+               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+               if (!vc) {
                        continue;
                }
-               
-               (*i)->set_position (next);
-               next = (*i)->end() + 1;
+       
+               if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                       vc->set_position (next_right);
+                       next_right = vc->end() + 1;
+               } else {
+                       vc->set_position (next_left);
+                       next_left = vc->end() + 1;
+               }
        }
 
        /* This won't change order, so it does not need a sort */
@@ -114,11 +120,11 @@ Playlist::video_identifier () const
 
 /** @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<string>& notes)
 {
-       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, notes));
        }
 
        sort (_content.begin(), _content.end(), ContentSorter ());
@@ -390,15 +396,3 @@ Playlist::move_later (shared_ptr<Content> c)
        
        Changed ();
 }
-
-bool
-Playlist::content_paths_valid () const
-{
-       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-               if (!(*i)->path_valid ()) {
-                       return false;
-               }
-       }
-
-       return true;
-}