Plot video and subtitle on one track and audio on the rest in the timeline.

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

diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 3262f13f37ad71cecdd36b519e850c431504f323..b1b8ecd5d44ffa0510e8c9272d8c887f60b5d1de 100644 (file)
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -43,15 +43,15 @@ public:
        void unset_track ();
        boost::optional<int> track () const;
 
-       virtual wxString type () const = 0;
+       virtual bool active () const = 0;
        virtual wxColour background_colour () const = 0;
        virtual wxColour foreground_colour () const = 0;
 
 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, bool frequent);
+       void content_changed (int p);
 
        boost::weak_ptr<Content> _content;
        boost::optional<int> _track;