No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index 2667d9834a7ecd5497e8cb8330722e653b7e09e3..45bf7e7cf51667e70031197df63e8690c824b890 100644 (file)
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
@@ -22,6 +23,8 @@
 #include <wx/wx.h>
 #include <wx/graphics.h>
 
+using std::list;
+
 TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
        : TimelineView (tl)
        , _y (y)
@@ -32,7 +35,7 @@ TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
 dcpomatic::Rect<int>
 TimelineTimeAxisView::bbox () const
 {
-       return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
+       return dcpomatic::Rect<int> (_timeline.tracks_position().x, _y - 4, _timeline.width(), 24);
 }
 
 void
@@ -43,7 +46,7 @@ TimelineTimeAxisView::set_y (int y)
 }
 
 void
-TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
+TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 {
        if (!_timeline.pixels_per_second()) {
                return;
@@ -72,7 +75,7 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
        }
 
        wxGraphicsPath path = gc->CreatePath ();
-       path.MoveToPoint (_timeline.x_offset(), _y);
+       path.MoveToPoint (_timeline.tracks_position().x, _y);
        path.AddLineToPoint (_timeline.width(), _y);
        gc->StrokePath (path);
 
@@ -100,7 +103,7 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
                wxDouble str_leading;
                gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 
-               int const tx = _timeline.x_offset() + t.seconds() * pps;
+               int const tx = _timeline.tracks_position().x + t.seconds() * pps;
                if ((tx + str_width) < _timeline.width()) {
                        gc->DrawText (str, time_x (t), _y + 16);
                }