X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.cc;h=5877aacbde1bfbc5111459688500dda454737d8f;hb=1427603608bd89846e363d478547a535eef75943;hp=989be3fad8d0d07da5570c1329a84db9684e7e6b;hpb=008096491dfda7682a8d60105195202d365957c6;p=dcpomatic.git

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 989be3fad..5877aacbd 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,6 +25,7 @@
 #include <wx/graphics.h>
 #include <boost/foreach.hpp>
 
+using std::list;
 using boost::shared_ptr;
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
@@ -31,7 +33,7 @@ TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
 	, _content (c)
 	, _selected (false)
 {
-	_content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2, _3));
+	_content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2));
 }
 
 dcpomatic::Rect<int>
@@ -91,7 +93,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 +134,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;
@@ -152,16 +160,11 @@ TimelineContentView::y_pos (int t) const
 }
 
 void
-TimelineContentView::content_changed (int p, bool frequent)
+TimelineContentView::content_changed (int p)
 {
 	ensure_ui_thread ();
 
 	if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) {
 		force_redraw ();
 	}
-
-	if (!frequent) {
-		_timeline.setup_pixels_per_second ();
-		_timeline.Refresh ();
-	}
 }