X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_view.h;h=166a1121a80df30432a08979dc11c07be043e647;hp=55fd64d51bfc453dc61545203a8439914347c6a4;hb=4d8f96e15edb4807cc9773cc7f9eb6aa56ac2dc8;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index 55fd64d51..166a1121a 100644
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -1,50 +1,58 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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.
 
-    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
-    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_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:
-	TimelineView (Timeline& t);
+	explicit TimelineView (Timeline& t);
 	virtual ~TimelineView () {}
 
-	void paint (wxGraphicsContext* g);
+	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 *) = 0;
+	virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int>> overlaps) = 0;
 
-	int time_x (DCPTime t) const;
+	int time_x (dcpomatic::DCPTime t) const;
+	int y_pos(int t) const;
 
 	Timeline& _timeline;
 
@@ -52,6 +60,8 @@ private:
 	dcpomatic::Rect<int> _last_paint_bbox;
 };
 
-typedef std::vector<boost::shared_ptr<TimelineView> > TimelineViewList;
+
+typedef std::vector<std::shared_ptr<TimelineView>> TimelineViewList;
+
 
 #endif