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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index d05597dd556540f50839f35fd57510fee75e7243..c4558f33f7286dc7b7a3992c11258de7078e83cd 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/lib/player.h b/src/lib/player.h
index 11cc99e7793005630a5e9ce1014e5827bdf55ed4..f7896d7d913515c6656cabd9dc9717fb1682467b 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 608323e3b5bde2aa32c6fc074541f73ac10afcdc..a2bec83bb3266948802c14f4c9fe4436e3b4e649 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -64,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 ();
        }
        
@@ -81,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 */

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 4e306c4998a526081e4629f79c03ba5d4fcaa63d..1858afee7cebc0a4b55de50be3b4fb7dc030dc8b 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -83,7 +83,6 @@ public:
        ContentView (Timeline& tl, shared_ptr<Content> c)
                : View (tl)
                , _content (c)
-               , _track (0)
                , _selected (false)
        {
                _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
@@ -91,6 +90,8 @@ public:
 
        dcpomatic::Rect<int> bbox () const
        {
+               assert (_track);
+
                shared_ptr<const Film> film = _timeline.film ();
                shared_ptr<const Content> content = _content.lock ();
                if (!film || !content) {
@@ -99,7 +100,7 @@ public:
                
                return dcpomatic::Rect<int> (
                        time_x (content->position ()) - 8,
-                       y_pos (_track) - 8,
+                       y_pos (_track.get()) - 8,
                        content->length_after_trim () * _timeline.pixels_per_time_unit() + 16,
                        _timeline.track_height() + 16
                        );
@@ -122,7 +123,7 @@ public:
                _track = t;
        }
 
-       int track () const {
+       optional<int> track () const {
                return _track;
        }
 
@@ -133,6 +134,8 @@ private:
 
        void do_paint (wxGraphicsContext* gc)
        {
+               assert (_track);
+
                shared_ptr<const Film> film = _timeline.film ();
                shared_ptr<const Content> cont = content ();
                if (!film || !cont) {
@@ -154,11 +157,11 @@ private:
                }
 
                wxGraphicsPath path = gc->CreatePath ();
-               path.MoveToPoint    (time_x (position),       y_pos (_track) + 4);
-               path.AddLineToPoint (time_x (position + len), y_pos (_track) + 4);
-               path.AddLineToPoint (time_x (position + len), y_pos (_track + 1) - 4);
-               path.AddLineToPoint (time_x (position),       y_pos (_track + 1) - 4);
-               path.AddLineToPoint (time_x (position),       y_pos (_track) + 4);
+               path.MoveToPoint    (time_x (position),       y_pos (_track.get()) + 4);
+               path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4);
+               path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4);
+               path.AddLineToPoint (time_x (position),       y_pos (_track.get() + 1) - 4);
+               path.AddLineToPoint (time_x (position),       y_pos (_track.get()) + 4);
                gc->StrokePath (path);
                gc->FillPath (path);
 
@@ -169,8 +172,8 @@ private:
                wxDouble name_leading;
                gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
                
-               gc->Clip (wxRegion (time_x (position), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height()));
-               gc->DrawText (name, time_x (position) + 12, y_pos (_track + 1) - name_height - 4);
+               gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len * _timeline.pixels_per_time_unit(), _timeline.track_height()));
+               gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
                gc->ResetClip ();
        }
 
@@ -194,7 +197,7 @@ private:
        }
 
        boost::weak_ptr<Content> _content;
-       int _track;
+       optional<int> _track;
        bool _selected;
 
        boost::signals2::scoped_connection _content_connection;
@@ -410,25 +413,17 @@ Timeline::assign_tracks ()
 {
        for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
                shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
-               if (cv) {
-                       cv->set_track (0);
-                       _tracks = 1;
-               }
-       }
-
-       for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<AudioContentView> acv = dynamic_pointer_cast<AudioContentView> (*i);
-               if (!acv) {
+               if (!cv) {
                        continue;
                }
        
-               shared_ptr<Content> acv_content = acv->content();
+               shared_ptr<Content> content = cv->content();
 
-               int t = 1;
+               int t = 0;
                while (1) {
                        ViewList::iterator j = _views.begin();
                        while (j != _views.end()) {
-                               shared_ptr<AudioContentView> test = dynamic_pointer_cast<AudioContentView> (*j);
+                               shared_ptr<ContentView> test = dynamic_pointer_cast<ContentView> (*j);
                                if (!test) {
                                        ++j;
                                        continue;
@@ -436,10 +431,10 @@ Timeline::assign_tracks ()
                                
                                shared_ptr<Content> test_content = test->content();
                                        
-                               if (test && test->track() == t) {
+                               if (test && test->track() && test->track().get() == t) {
                                        bool const no_overlap =
-                                               (acv_content->position() < test_content->position() && acv_content->end() < test_content->position()) ||
-                                               (acv_content->position() > test_content->end()      && acv_content->end() > test_content->end());
+                                               (content->position() < test_content->position() && content->end() < test_content->position()) ||
+                                               (content->position() > test_content->end()      && content->end() > test_content->end());
                                        
                                        if (!no_overlap) {
                                                /* we have an overlap on track `t' */
@@ -457,7 +452,7 @@ Timeline::assign_tracks ()
                        }
                }
 
-               acv->set_track (t);
+               cv->set_track (t);
                _tracks = max (_tracks, t + 1);
        }