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

1 files changed, 8 insertions, 1 deletions

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index ed7e1d3d0..b520b5ceb 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -24,6 +24,7 @@
 #include <wx/graphics.h>
 #include <boost/foreach.hpp>
 
+using std::list;
 using boost::shared_ptr;
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
@@ -91,7 +92,7 @@ TimelineContentView::track () const
 }
 
 void
-TimelineContentView::do_paint (wxGraphicsContext* gc)
+TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> > overlaps)
 {
 	DCPOMATIC_ASSERT (_track);
 
@@ -132,6 +133,12 @@ TimelineContentView::do_paint (wxGraphicsContext* gc)
 		gc->StrokePath (path);
 	}
 
+	/* Overlaps */
+	gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (foreground_colour(), wxBRUSHSTYLE_CROSSDIAG_HATCH));
+	for (list<dcpomatic::Rect<int> >::const_iterator i = overlaps.begin(); i != overlaps.end(); ++i) {
+		gc->DrawRectangle (i->x, i->y + 4, i->width, i->height - 8);
+	}
+
 	/* Label text */
 	wxString name = std_to_wx (cont->summary());
 	wxDouble name_width;