projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index 802aaf245acfedf2576b38c7b456c7d1eb1114c8..8134aa6dbae15c34503237eb5e16d0d1fda9c155 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-1,41
+1,48
@@
/*
/*
- 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 TimelineDialog : public wxDialog
{
public:
class TimelineDialog : public wxDialog
{
public:
- TimelineDialog (ContentPanel *, boost::shared_ptr<Film>);
+ TimelineDialog(ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
+
+ void set_selection (ContentList selection);
private:
private:
- void
snap_toggled (
);
- void
sequence_video_toggled (
);
- void
film_changed (Film::Property
);
-
-
boost
::weak_ptr<Film> _film;
+ void
film_change(ChangeType type, FilmProperty
);
+ void
tool_clicked (wxCommandEvent& id
);
+ void
keypress(wxKeyEvent const& event
);
+
+
std
::weak_ptr<Film> _film;
Timeline _timeline;
Timeline _timeline;
- wx
CheckBox* _snap
;
-
wxCheckBox* _sequence_video
;
+ wx
ToolBar* _toolbar
;
+
boost::signals2::scoped_connection _film_changed_connection
;
};
};