projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plot video and subtitle on one track and audio on the rest in the timeline.
[dcpomatic.git]
/
src
/
wx
/
timeline_view.cc
diff --git
a/src/wx/timeline_view.cc
b/src/wx/timeline_view.cc
index fee1921ed3019caca45574ea73fdfd1551d6f26d..d96b8998fd6cf1d14e4666f2654142528b680be4 100644
(file)
--- a/
src/wx/timeline_view.cc
+++ b/
src/wx/timeline_view.cc
@@
-20,6
+20,8
@@
#include "timeline_view.h"
#include "timeline.h"
#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).
*/
/** @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
}
void
-TimelineView::paint (wxGraphicsContext* g)
+TimelineView::paint (wxGraphicsContext* g
, list<dcpomatic::Rect<int> > overlaps
)
{
_last_paint_bbox = bbox ();
{
_last_paint_bbox = bbox ();
- do_paint (g);
+ do_paint (g
, overlaps
);
}
void
}
void