X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_view.h;h=d94e101244de0d028e941b9a9972c15cadf0e0fd;hb=cc09cc4b12d199d490217d7b60ed0af69afb90de;hp=01f1ca23d2c44bbe63e0b2ef5ba5677a446bc22b;hpb=d2e8a683eed6fb82d4d255fffaf571ff27057132;p=dcpomatic.git diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h index 01f1ca23d..d94e10124 100644 --- a/src/wx/timeline_view.h +++ b/src/wx/timeline_view.h @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2015 Carl Hetherington - 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 . */ @@ -33,7 +34,7 @@ class Timeline; class TimelineView : public boost::noncopyable { public: - TimelineView (Timeline& t); + explicit TimelineView (Timeline& t); virtual ~TimelineView () {} void paint (wxGraphicsContext* g, std::list > overlaps); @@ -44,7 +45,7 @@ public: protected: virtual void do_paint (wxGraphicsContext *, std::list > overlaps) = 0; - int time_x (DCPTime t) const; + int time_x (dcpomatic::DCPTime t) const; Timeline& _timeline;