Plot video and subtitle on one track and audio on the rest in the timeline.

[dcpomatic.git] / src / wx / timeline.cc

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index a964ea98daeb507320436991212c100f6e3fcd4f..de20705316d04419df7c389e04d02b28735f97f5 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -89,8 +89,26 @@ Timeline::paint ()
                return;
        }
 
-       for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               (*i)->paint (gc);
+
+       BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
+
+               shared_ptr<TimelineContentView> ic = dynamic_pointer_cast<TimelineContentView> (i);
+
+               /* Find areas of overlap */
+               list<dcpomatic::Rect<int> > overlaps;
+               BOOST_FOREACH (shared_ptr<TimelineView> j, _views) {
+                       shared_ptr<TimelineContentView> jc = dynamic_pointer_cast<TimelineContentView> (j);
+                       if (!ic || !jc || i == j || ic->track() != jc->track() || !ic->active() || !jc->active()) {
+                               continue;
+                       }
+
+                       optional<dcpomatic::Rect<int> > r = j->bbox().intersection (i->bbox());
+                       if (r) {
+                               overlaps.push_back (r.get ());
+                       }
+               }
+
+               i->paint (gc, overlaps);
        }
 
        delete gc;
@@ -169,14 +187,28 @@ Timeline::assign_tracks ()
                        continue;
                }
 
+               if (dynamic_pointer_cast<TimelineVideoContentView> (*i)) {
+                       /* Video on track 0 */
+                       cv->set_track (0);
+                       _tracks = max (_tracks, 1);
+                       continue;
+               } else if (dynamic_pointer_cast<TimelineSubtitleContentView> (*i)) {
+                       /* Subtitles on track 1 */
+                       cv->set_track (1);
+                       _tracks = max (_tracks, 2);
+                       continue;
+               }
+
+               /* Audio on tracks 2 and up */
+               int t = 2;
+
                shared_ptr<Content> content = cv->content();
                DCPTimePeriod content_period (content->position(), content->end());
 
-               int t = 0;
                while (true) {
                        TimelineViewList::iterator j = _views.begin();
                        while (j != _views.end()) {
-                               shared_ptr<TimelineContentView> test = dynamic_pointer_cast<TimelineContentView> (*j);
+                               shared_ptr<TimelineAudioContentView> test = dynamic_pointer_cast<TimelineAudioContentView> (*j);
                                if (!test) {
                                        ++j;
                                        continue;
@@ -229,13 +261,15 @@ Timeline::setup_pixels_per_second ()
 shared_ptr<TimelineView>
 Timeline::event_to_view (wxMouseEvent& ev)
 {
-       TimelineViewList::iterator i = _views.begin();
+       /* Search backwards through views so that we find the uppermost one first */
+       TimelineViewList::reverse_iterator i = _views.rbegin();
        Position<int> const p (ev.GetX(), ev.GetY());
-       while (i != _views.end() && !(*i)->bbox().contains (p)) {
+       while (i != _views.rend() && !(*i)->bbox().contains (p)) {
+               shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
                ++i;
        }
 
-       if (i == _views.end ()) {
+       if (i == _views.rend ()) {
                return shared_ptr<TimelineView> ();
        }