summaryrefslogtreecommitdiff
path: root/src/wx/timeline_time_axis_view.h
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_time_axis_view.h
parent03356464b29ff84f72d252efb22502754f55cfce (diff)
Plot video and subtitle on one track and audio on the rest in the timeline.
Diffstat (limited to 'src/wx/timeline_time_axis_view.h')
-rw-r--r--src/wx/timeline_time_axis_view.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timeline_time_axis_view.h b/src/wx/timeline_time_axis_view.h
index f72acd4a7..fbd7c5de9 100644
--- a/src/wx/timeline_time_axis_view.h
+++ b/src/wx/timeline_time_axis_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
@@ -28,7 +28,7 @@ public:
void set_y (int y);
private:
- void do_paint (wxGraphicsContext* gc);
+ void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
private:
int _y;