X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.h;h=155d51fac4b0289d134f4459e26cea905e9d5b7c;hb=2f518094d7db4e8586eba9c741289735794c572c;hp=77dfede50c452d69107daf080918cc95b514f0b8;hpb=61724dd3c9656d1e26ae945ce784ca50c2059695;p=dcpomatic.git diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index 77dfede50..155d51fac 100644 --- a/src/wx/timeline_dialog.h +++ b/src/wx/timeline_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2019 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,25 +18,30 @@ */ -#include -#include -#include + #include "timeline.h" +#include +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS + class Playlist; + class TimelineDialog : public wxDialog { public: - TimelineDialog (ContentPanel *, boost::shared_ptr, boost::weak_ptr viewer); + TimelineDialog(ContentPanel *, std::shared_ptr, FilmViewer& viewer); void set_selection (ContentList selection); private: void film_change (ChangeType type, Film::Property); void tool_clicked (wxCommandEvent& id); + void keypress(wxKeyEvent const& event); - boost::weak_ptr _film; + std::weak_ptr _film; Timeline _timeline; wxToolBar* _toolbar; boost::signals2::scoped_connection _film_changed_connection;