X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.h;h=f5dea4eef3c54ab2eae034282f9fb91de281e274;hb=HEAD;hp=dc583a9f08ca35c32b73d4e6d6977dfffcd86633;hpb=f07a469603298049d12e1af9deda4ad830362e58;p=dcpomatic.git

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index dc583a9f0..8134aa6db 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.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,29 +18,31 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <wx/wx.h>
+
 #include "timeline.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 class Playlist;
 
+
 class TimelineDialog : public wxDialog
 {
 public:
-	TimelineDialog (ContentPanel *, boost::shared_ptr<Film>);
+	TimelineDialog(ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
 
 	void set_selection (ContentList selection);
 
 private:
-	void snap_toggled ();
-	void sequence_toggled ();
-	void film_changed (Film::Property);
-	void tool_changed (wxCommandEvent& id);
+	void film_change(ChangeType type, FilmProperty);
+	void tool_clicked (wxCommandEvent& id);
+	void keypress(wxKeyEvent const& event);
 
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
 	Timeline _timeline;
-	wxCheckBox* _snap;
-	wxCheckBox* _sequence;
+	wxToolBar* _toolbar;
 	boost::signals2::scoped_connection _film_changed_connection;
 };