projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: set controls to 'stopped' when a playlist finishes.
[dcpomatic.git]
/
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 4b17c099d7744d6d54e0e2cd08d20924cb23eae8..5477e61f13cfaf660f5c95af1ab480e0383a0d32 100644
(file)
--- a/
src/wx/timeline_time_axis_view.h
+++ b/
src/wx/timeline_time_axis_view.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-27,10
+28,8
@@
public:
dcpomatic::Rect<int> bbox () const;
void set_y (int y);
dcpomatic::Rect<int> bbox () const;
void set_y (int y);
-private:
- void do_paint (wxGraphicsContext* gc);
-
private:
private:
- int _y;
-};
+ void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
+ int _y; ///< y position in tracks (not pixels)
+};