Move _state_timer into VideoView.

[dcpomatic.git] / src / wx / timeline_view.h

diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index 55fd64d51bfc453dc61545203a8439914347c6a4..d94e101244de0d028e941b9a9972c15cadf0e0fd 100644 (file)
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 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/>.
 
 */
 
@@ -33,18 +34,18 @@ class Timeline;
 class TimelineView : public boost::noncopyable
 {
 public:
-       TimelineView (Timeline& t);
+       explicit TimelineView (Timeline& t);
        virtual ~TimelineView () {}
 
-       void paint (wxGraphicsContext* g);
+       void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int> > overlaps);
        void force_redraw ();
 
        virtual dcpomatic::Rect<int> bbox () const = 0;
 
 protected:
-       virtual void do_paint (wxGraphicsContext *) = 0;
+       virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int> > overlaps) = 0;
 
-       int time_x (DCPTime t) const;
+       int time_x (dcpomatic::DCPTime t) const;
 
        Timeline& _timeline;