Rename Timeline -> ContentTimeline.

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

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 97ddca964aff23df74efaf65c50635ed1bc739a4..d2821c20c08b0b2aec3d6a809c89e67374cc9947 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,31 @@
 
 */
 
+
+#include "content_timeline.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include "timeline.h"
+LIBDCP_ENABLE_WARNINGS
+
 
 class Playlist;
 
+
 class TimelineDialog : public wxDialog
 {
 public:
-       TimelineDialog (ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+       TimelineDialog(ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
 
        void set_selection (ContentList selection);
 
 private:
-       void film_change (ChangeType type, Film::Property);
+       void film_change(ChangeType type, FilmProperty);
        void tool_clicked (wxCommandEvent& id);
+       void keypress(wxKeyEvent const& event);
 
        std::weak_ptr<Film> _film;
-       Timeline _timeline;
+       ContentTimeline _timeline;
        wxToolBar* _toolbar;
        boost::signals2::scoped_connection _film_changed_connection;
 };