Move y_pos to TimelineView.

[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..aa9832e5db14453accce3c2ae88fa17587d261e8 100644 (file)
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,23 @@
 
 */
 
+
 #ifndef DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
-#include "lib/types.h"
-#include "lib/warnings.h"
+
 #include "timeline_view.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "lib/change_signaller.h"
+#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class 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);
 
-       dcpomatic::Rect<int> bbox () const;
+       dcpomatic::Rect<int> bbox () const override;
 
        void set_selected (bool s);
        bool selected () const;
@@ -59,16 +63,17 @@ protected:
 
 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;
-       bool _selected;
+       bool _selected = false;
 
        boost::signals2::scoped_connection _content_connection;
 };
 
-typedef std::vector<std::shared_ptr<TimelineContentView> > TimelineContentViewList;
+
+typedef std::vector<std::shared_ptr<TimelineContentView>> TimelineContentViewList;
+
 
 #endif