summaryrefslogtreecommitdiff
path: root/src/wx/film_editor.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-14 01:34:55 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-14 01:34:55 +0100
commit1420c529d7e196f96ddf9580efdc09fa01c55d58 (patch)
tree83e45ce895aea33796e4d38fe76b8e63dd5b3c13 /src/wx/film_editor.cc
parent4afb0f713c068ef842fdcbb230aafd22a49e245b (diff)
Add buttons to set trim from current playhead position (#372).
Diffstat (limited to 'src/wx/film_editor.cc')
-rw-r--r--src/wx/film_editor.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 944ff3572..bbfafa8c5 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -17,8 +17,8 @@
*/
-/** @file src/film_editor.cc
- * @brief A wx widget to edit a film's metadata, and perform various functions.
+/** @file src/wx/film_editor.cc
+ * @brief FilmEditor class.
*/
#include "lib/film.h"
@@ -37,7 +37,7 @@ using std::cout;
using boost::shared_ptr;
/** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent)
+FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -45,7 +45,7 @@ FilmEditor::FilmEditor (wxWindow* parent)
_main_notebook = new wxNotebook (this, wxID_ANY);
s->Add (_main_notebook, 1);
- _content_panel = new ContentPanel (_main_notebook, _film);
+ _content_panel = new ContentPanel (_main_notebook, _film, viewer);
_main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
_dcp_panel = new DCPPanel (_main_notebook, _film);
_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);