diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-27 21:54:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-27 21:54:50 +0100 |
| commit | 6166c045a8de42edd09924fdd995a77a3b753e54 (patch) | |
| tree | 91da3177d9802c0b9da84607eb3c3831ffc975b5 /src/wx/timeline_dialog.cc | |
| parent | a4642b6463430175d0f4e1ca284a4bf08bcf4de9 (diff) | |
Support for keeping video in sequence when changing lengths; tie selection in timeline with that in the editor.
Diffstat (limited to 'src/wx/timeline_dialog.cc')
| -rw-r--r-- | src/wx/timeline_dialog.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 91d1f7b07..35d5eec21 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -19,6 +19,7 @@ #include <list> #include <wx/graphics.h> +#include "film_editor.h" #include "timeline_dialog.h" #include "wx_util.h" #include "playlist.h" @@ -27,9 +28,9 @@ using std::list; using std::cout; using boost::shared_ptr; -TimelineDialog::TimelineDialog (wxWindow* parent, shared_ptr<const Film> film) - : wxDialog (parent, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) - , _timeline (this, film) +TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film) + : wxDialog (ed, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) + , _timeline (this, ed, film) { wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); |