projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index dc583a9f08ca35c32b73d4e6d6977dfffcd86633..97ddca964aff23df74efaf65c50635ed1bc739a4 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,8
+18,6
@@
*/
*/
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <wx/wx.h>
#include "timeline.h"
#include <wx/wx.h>
#include "timeline.h"
@@
-28,19
+26,16
@@
class Playlist;
class TimelineDialog : public wxDialog
{
public:
class TimelineDialog : public wxDialog
{
public:
- TimelineDialog (ContentPanel *,
boost::shared_ptr<Film>
);
+ TimelineDialog (ContentPanel *,
std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer
);
void set_selection (ContentList selection);
private:
void set_selection (ContentList selection);
private:
- void snap_toggled ();
- void sequence_toggled ();
- void film_changed (Film::Property);
- void tool_changed (wxCommandEvent& id);
+ void film_change (ChangeType type, Film::Property);
+ void tool_clicked (wxCommandEvent& id);
-
boost
::weak_ptr<Film> _film;
+
std
::weak_ptr<Film> _film;
Timeline _timeline;
Timeline _timeline;
- wxCheckBox* _snap;
- wxCheckBox* _sequence;
+ wxToolBar* _toolbar;
boost::signals2::scoped_connection _film_changed_connection;
};
boost::signals2::scoped_connection _film_changed_connection;
};