X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.h;h=2573e3cb311b970cc181c1a76825b04beaa955bc;hp=07bfb25759a4e73839e98778597c3d9026dc6209;hb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;hpb=e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a

diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 07bfb2575..2573e3cb3 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -1,27 +1,32 @@
 /*
-    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/>.
 
 */
 
 #ifndef DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
+#include "lib/types.h"
+#include "lib/warnings.h"
 #include "timeline_view.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class Content;
@@ -43,16 +48,21 @@ public:
 	void unset_track ();
 	boost::optional<int> track () const;
 
+	virtual bool active () const = 0;
 	virtual wxColour background_colour () const = 0;
 	virtual wxColour foreground_colour () const = 0;
+	virtual wxString label () const;
+
+protected:
+
+	boost::weak_ptr<Content> _content;
 
 private:
 
-	void do_paint (wxGraphicsContext* gc);
+	void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
 	int y_pos (int t) const;
-	void content_changed (int p);
+	void content_change (ChangeType type, int p);
 
-	boost::weak_ptr<Content> _content;
 	boost::optional<int> _track;
 	bool _selected;