summaryrefslogtreecommitdiff
path: root/src/wx/timeline_view.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-25 17:06:44 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-25 17:06:44 +0000
commitd2e8a683eed6fb82d4d255fffaf571ff27057132 (patch)
treebea3ed6db13ab6d5a72673aa2c30a55d9e188f03 /src/wx/timeline_view.cc
parent03356464b29ff84f72d252efb22502754f55cfce (diff)
Plot video and subtitle on one track and audio on the rest in the timeline.
Diffstat (limited to 'src/wx/timeline_view.cc')
-rw-r--r--src/wx/timeline_view.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc
index fee1921ed..d96b8998f 100644
--- a/src/wx/timeline_view.cc
+++ b/src/wx/timeline_view.cc
@@ -20,6 +20,8 @@
#include "timeline_view.h"
#include "timeline.h"
+using std::list;
+
/** @class TimelineView
* @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
*/
@@ -30,10 +32,10 @@ TimelineView::TimelineView (Timeline& t)
}
void
-TimelineView::paint (wxGraphicsContext* g)
+TimelineView::paint (wxGraphicsContext* g, list<dcpomatic::Rect<int> > overlaps)
{
_last_paint_bbox = bbox ();
- do_paint (g);
+ do_paint (g, overlaps);
}
void