*/
+#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;
};