projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pot/merge.
[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 fcc0680647734c7dc80ca906b42e2eb0ef324266..7087e9641b62cd7073792cfa97441ff89b0fabd8 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,9
+18,12
@@
*/
*/
+
#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 "lib/types.h"
#include "lib/warnings.h"
#include "timeline_view.h"
@@
-31,6
+34,7
@@
DCPOMATIC_ENABLE_WARNINGS
class Content;
class Content;
+
/** @class TimelineContentView
* @brief Parent class for views of pieces of content.
*/
/** @class TimelineContentView
* @brief Parent class for views of pieces of content.
*/
@@
-39,7
+43,7
@@
class TimelineContentView : public TimelineView
public:
TimelineContentView (Timeline& tl, std::shared_ptr<Content> c);
public:
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;
@@
-59,16
+63,18
@@
protected:
private:
private:
- void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>
> overlaps)
;
+ void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>
> overlaps) override
;
int y_pos (int t) const;
void content_change (ChangeType type, int p);
boost::optional<int> _track;
int y_pos (int t) const;
void content_change (ChangeType type, int p);
boost::optional<int> _track;
- bool _selected;
+ bool _selected
= false
;
boost::signals2::scoped_connection _content_connection;
};
boost::signals2::scoped_connection _content_connection;
};
-typedef std::vector<std::shared_ptr<TimelineContentView> > TimelineContentViewList;
+
+typedef std::vector<std::shared_ptr<TimelineContentView>> TimelineContentViewList;
+
#endif
#endif