projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libsub for SSA Margin{L,R} support (#2811).
[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 e9b29485473b7eb64349c4548e4f0b5fa423e1cc..7794120cdc96762880e944bb14baf1b58b12503e 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-18,20
+18,22
@@
*/
*/
+
#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 "lib/change_signaller.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_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
* @brief Parent class for views of pieces of content.
*/
@@
-40,7
+42,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;
@@
-60,8
+62,7
@@
protected:
private:
private:
- void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
- int y_pos (int t) const;
+ void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
void content_change (ChangeType type, int p);
boost::optional<int> _track;
void content_change (ChangeType type, int p);
boost::optional<int> _track;
@@
-70,6
+71,8
@@
private:
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