From d2e8a683eed6fb82d4d255fffaf571ff27057132 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Feb 2016 17:06:44 +0000 Subject: Plot video and subtitle on one track and audio on the rest in the timeline. --- src/wx/timeline_time_axis_view.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/wx/timeline_time_axis_view.h') 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 + Copyright (C) 2013-2016 Carl Hetherington 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 > overlaps); private: int _y; -- cgit v1.2.3