projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: alphabetically sort playlists.
[dcpomatic.git]
/
src
/
wx
/
timeline_content_view.h
diff --git
a/src/wx/timeline_content_view.h
b/src/wx/timeline_content_view.h
index b1b8ecd5d44ffa0510e8c9272d8c887f60b5d1de..27cfed53eef989373eee4db604886d4890c3facb 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-1,25
+1,27
@@
/*
Copyright (C) 2013-2016 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
+ 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/>.
*/
#ifndef DCPOMATIC_TIMELINE_CONTENT_VIEW_H
#define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
*/
#ifndef DCPOMATIC_TIMELINE_CONTENT_VIEW_H
#define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
+#include "lib/types.h"
#include "timeline_view.h"
#include <wx/wx.h>
#include <boost/signals2.hpp>
#include "timeline_view.h"
#include <wx/wx.h>
#include <boost/signals2.hpp>
@@
-46,14
+48,18
@@
public:
virtual bool active () const = 0;
virtual wxColour background_colour () const = 0;
virtual wxColour foreground_colour () const = 0;
virtual bool active () const = 0;
virtual wxColour background_colour () const = 0;
virtual wxColour foreground_colour () const = 0;
+ virtual wxString label () const;
+
+protected:
+
+ boost::weak_ptr<Content> _content;
private:
void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
int y_pos (int t) const;
private:
void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
int y_pos (int t) const;
- void content_change
d (
int p);
+ void content_change
(ChangeType type,
int p);
- boost::weak_ptr<Content> _content;
boost::optional<int> _track;
bool _selected;
boost::optional<int> _track;
bool _selected;