X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ftimeline_reels_view.cc;h=f09a52a53b7724e5bec35514bc3d709c93fb55f3;hb=86bbc0981a60ad9ba7b7bdbf28a34f197f83f6cb;hp=cc9d401cf1430bb700ed97d190e2b56429b2fc6d;hpb=9b1aef54c2ad164337a82ac6913ba5a095bf5266;p=dcpomatic.git

diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index cc9d401cf..f09a52a53 100644
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-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 <boost/foreach.hpp>
 
 using std::min;
+using std::list;
 
 TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
 	: TimelineView (tl)
@@ -46,7 +48,7 @@ TimelineReelsView::set_y (int y)
 }
 
 void
-TimelineReelsView::do_paint (wxGraphicsContext* gc)
+TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 {
 	if (!_timeline.pixels_per_second()) {
 		return;
@@ -86,7 +88,7 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc)
 		wxDouble str_leading;
 		gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 
-		int const available_width = time_x (DCPTime (i.to.get() - i.from.get()));
+		int const available_width = time_x (DCPTime (i.to.get())) - time_x (DCPTime (i.from.get()));
 
 		if (available_width > str_width) {
 			gc->DrawText (str, time_x (DCPTime (i.from.get())) + (available_width - str_width) / 2, _y + 4);