X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.h;h=8796f2bbfc41add263dfb0ca328d960e95527053;hb=7ec6c86c913fba820870565ee757fdf43ae47433;hp=b7aaba14d92e16839968d4e20c386e637ec63597;hpb=9e065519743ff8eac63207552a97314febca24c7;p=dcpomatic.git diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index b7aaba14d..8796f2bbf 100644 --- a/src/wx/timeline_dialog.h +++ b/src/wx/timeline_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,26 +18,29 @@ */ -#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); + TimelineDialog (ContentPanel *, std::shared_ptr, std::weak_ptr viewer); void set_selection (ContentList selection); private: - void film_changed (Film::Property); + void film_change (ChangeType type, Film::Property); void tool_clicked (wxCommandEvent& id); - wxString bitmap_path (std::string name); - boost::weak_ptr _film; + std::weak_ptr _film; Timeline _timeline; wxToolBar* _toolbar; boost::signals2::scoped_connection _film_changed_connection;