projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
And another missed warnings.h
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index b64445d9cf88447a8b5638f1d579641864700879..8796f2bbfc41add263dfb0ca328d960e95527053 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-1,37
+1,47
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2021
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <wx/wx.h>
+
#include "timeline.h"
#include "timeline.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
class Playlist;
class Playlist;
-class DCPTimelineDialog : public wxDialog
+
+class TimelineDialog : public wxDialog
{
public:
{
public:
- DCPTimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
+ TimelineDialog (ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+
+ void set_selection (ContentList selection);
private:
private:
- void snap_toggled ();
-
- DCPTimeline _timeline;
- wxCheckBox* _snap;
+ void film_change (ChangeType type, Film::Property);
+ void tool_clicked (wxCommandEvent& id);
+
+ std::weak_ptr<Film> _film;
+ Timeline _timeline;
+ wxToolBar* _toolbar;
+ boost::signals2::scoped_connection _film_changed_connection;
};
};