X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.h;h=e9b29485473b7eb64349c4548e4f0b5fa423e1cc;hb=e0255a64d22440d718e5512f34a4f21f0d37a21b;hp=2573e3cb311b970cc181c1a76825b04beaa955bc;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git

diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 2573e3cb3..e9b294854 100644
--- 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.
 
@@ -21,6 +21,7 @@
 #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"
@@ -37,13 +38,13 @@ class Content;
 class TimelineContentView : public TimelineView
 {
 public:
-	TimelineContentView (Timeline& tl, boost::shared_ptr<Content> c);
+	TimelineContentView (Timeline& tl, std::shared_ptr<Content> c);
 
 	dcpomatic::Rect<int> bbox () const;
 
 	void set_selected (bool s);
 	bool selected () const;
-	boost::shared_ptr<Content> content () const;
+	std::shared_ptr<Content> content () const;
 	void set_track (int t);
 	void unset_track ();
 	boost::optional<int> track () const;
@@ -55,7 +56,7 @@ public:
 
 protected:
 
-	boost::weak_ptr<Content> _content;
+	std::weak_ptr<Content> _content;
 
 private:
 
@@ -64,11 +65,11 @@ private:
 	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<boost::shared_ptr<TimelineContentView> > TimelineContentViewList;
+typedef std::vector<std::shared_ptr<TimelineContentView> > TimelineContentViewList;
 
 #endif