X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.h;h=24c046a6a2faaabebb85400972fcb339ff0e36fe;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=44a8973716bdd3dca7f3df7fe761f5fd1a019f40;hpb=579d18cb7770efe2da03afaf6a33faaf624119e3;p=dcpomatic.git

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 44a897371..24c046a6a 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -20,28 +20,31 @@
 
 #include "content_menu.h"
 #include "timeline_content_view.h"
-#include "lib/util.h"
-#include "lib/rect.h"
 #include "lib/film.h"
+#include "lib/rect.h"
+#include "lib/util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
-class Film;
+
 class ContentPanel;
-class TimelineView;
-class TimelineTimeAxisView;
-class TimelineReelsView;
-class TimelineLabelsView;
+class Film;
 class FilmViewer;
+class TimelineLabelsView;
+class TimelineReelsView;
+class TimelineTimeAxisView;
+class TimelineView;
+
 
 class Timeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-	boost::shared_ptr<const Film> film () const;
+	std::shared_ptr<const Film> film () const;
 
 	void force_redraw (dcpomatic::Rect<int> const &);
 
@@ -106,7 +109,7 @@ private:
 	void zoom_all ();
 	void update_playhead ();
 
-	boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+	std::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
 	TimelineContentViewList selected_views () const;
 	ContentList selected_content () const;
 	void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
@@ -114,18 +117,18 @@ private:
 	wxScrolledCanvas* _labels_canvas;
 	wxScrolledCanvas* _main_canvas;
 	ContentPanel* _content_panel;
-	boost::weak_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::weak_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
 	TimelineViewList _views;
-	boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
-	boost::shared_ptr<TimelineReelsView> _reels_view;
-	boost::shared_ptr<TimelineLabelsView> _labels_view;
+	std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
+	std::shared_ptr<TimelineReelsView> _reels_view;
+	std::shared_ptr<TimelineLabelsView> _labels_view;
 	int _tracks;
 	boost::optional<double> _pixels_per_second;
 	bool _left_down;
 	wxPoint _down_point;
 	boost::optional<wxPoint> _zoom_point;
-	boost::shared_ptr<TimelineContentView> _down_view;
+	std::shared_ptr<TimelineContentView> _down_view;
 	dcpomatic::DCPTime _down_view_position;
 	bool _first_move;
 	ContentMenu _menu;