projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing verification messages.
[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 d5c9126c07fa7d3a94ffd52544a55a64679b62bd..7087e9641b62cd7073792cfa97441ff89b0fabd8 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-1,65
+1,80
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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/change_signaller.h"
+#include "lib/types.h"
+#include "lib/warnings.h"
#include "timeline_view.h"
#include "timeline_view.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
class Content;
#include <boost/signals2.hpp>
class Content;
+
/** @class TimelineContentView
* @brief Parent class for views of pieces of content.
*/
class TimelineContentView : public TimelineView
{
public:
/** @class TimelineContentView
* @brief Parent class for views of pieces of content.
*/
class TimelineContentView : public TimelineView
{
public:
- TimelineContentView (Timeline& tl,
boost
::shared_ptr<Content> c);
+ TimelineContentView (Timeline& tl,
std
::shared_ptr<Content> c);
- dcpomatic::Rect<int> bbox () const;
+ dcpomatic::Rect<int> bbox () const
override
;
void set_selected (bool s);
bool selected () const;
void set_selected (bool s);
bool selected () const;
-
boost
::shared_ptr<Content> content () const;
+
std
::shared_ptr<Content> content () const;
void set_track (int t);
void unset_track ();
boost::optional<int> track () const;
void set_track (int t);
void unset_track ();
boost::optional<int> track () const;
- virtual
wxString typ
e () const = 0;
+ virtual
bool activ
e () const = 0;
virtual wxColour background_colour () const = 0;
virtual wxColour foreground_colour () const = 0;
virtual wxColour background_colour () const = 0;
virtual wxColour foreground_colour () const = 0;
-
+ virtual wxString label () const;
+
+protected:
+
+ std::weak_ptr<Content> _content;
+
private:
private:
- void do_paint (wxGraphicsContext* gc
)
;
+ void do_paint (wxGraphicsContext* gc
, std::list<dcpomatic::Rect<int>> overlaps) override
;
int y_pos (int t) const;
int y_pos (int t) const;
- void content_change
d (int p, bool frequent
);
+ void content_change
(ChangeType type, int p
);
- boost::weak_ptr<Content> _content;
boost::optional<int> _track;
boost::optional<int> _track;
- bool _selected;
+ bool _selected
= false
;
boost::signals2::scoped_connection _content_connection;
};
boost::signals2::scoped_connection _content_connection;
};
-typedef std::vector<boost::shared_ptr<TimelineContentView> > TimelineContentViewList;
+
+typedef std::vector<std::shared_ptr<TimelineContentView>> TimelineContentViewList;
+
#endif
#endif