Move y_pos to TimelineView.

[dcpomatic.git] / src / wx / timeline_view.h

diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index bfd1de8b752a9e7fb84915355484c87a9d2f8265..166a1121a80df30432a08979dc11c07be043e647 100644 (file)
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,34 +18,41 @@
 
 */
 
+
 #ifndef DCPOMATIC_TIMELINE_VIEW_H
 #define DCPOMATIC_TIMELINE_VIEW_H
 
+
 #include "lib/rect.h"
 #include "lib/dcpomatic_time.h"
-#include <boost/noncopyable.hpp>
+
 
 class wxGraphicsContext;
 class Timeline;
 
+
 /** @class TimelineView
  *  @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
  */
-class TimelineView : public boost::noncopyable
+class TimelineView
 {
 public:
        explicit TimelineView (Timeline& t);
        virtual ~TimelineView () {}
 
-       void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int> > overlaps);
+       TimelineView (TimelineView const&) = delete;
+       TimelineView& operator= (TimelineView const&) = delete;
+
+       void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int>> overlaps);
        void force_redraw ();
 
        virtual dcpomatic::Rect<int> bbox () const = 0;
 
 protected:
-       virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int> > overlaps) = 0;
+       virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int>> overlaps) = 0;
 
        int time_x (dcpomatic::DCPTime t) const;
+       int y_pos(int t) const;
 
        Timeline& _timeline;
 
@@ -53,6 +60,8 @@ private:
        dcpomatic::Rect<int> _last_paint_bbox;
 };
 
-typedef std::vector<std::shared_ptr<TimelineView> > TimelineViewList;
+
+typedef std::vector<std::shared_ptr<TimelineView>> TimelineViewList;
+
 
 #endif