diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-14 01:34:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-14 01:34:55 +0100 |
| commit | 1420c529d7e196f96ddf9580efdc09fa01c55d58 (patch) | |
| tree | 83e45ce895aea33796e4d38fe76b8e63dd5b3c13 /src/wx/content_panel.cc | |
| parent | 4afb0f713c068ef842fdcbb230aafd22a49e245b (diff) | |
Add buttons to set trim from current playhead position (#372).
Diffstat (limited to 'src/wx/content_panel.cc')
| -rw-r--r-- | src/wx/content_panel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 0b2700d28..a6d013434 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -48,7 +48,7 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f) +ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f, FilmViewer* viewer) : _timeline_dialog (0) , _film (f) , _generally_sensitive (true) @@ -109,7 +109,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f) _panels.push_back (_audio_panel); _subtitle_panel = new SubtitlePanel (this); _panels.push_back (_subtitle_panel); - _timing_panel = new TimingPanel (this); + _timing_panel = new TimingPanel (this, viewer); _panels.push_back (_timing_panel); _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); |