Don't draw any overlap for audio views.
authorCarl Hetherington <cth@carlh.net>
Thu, 25 Feb 2016 23:27:47 +0000 (23:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 25 Feb 2016 23:27:47 +0000 (23:27 +0000)
src/wx/timeline.cc

index b7f4ec23186a5a25411567e027064a2f61309f71..ba320bf2fb184c3fb4aeeef0c3f48e1ad926b2ae 100644 (file)
@@ -103,7 +103,8 @@ Timeline::paint ()
                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()) {
+                       /* No overlap with non-content views, views no different tracks, audio views or non-active views */
+                       if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) {
                                continue;
                        }