X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=78a5c440cfe24cbc8dedf2aab491ef7f5eb8edb1;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=728098b934ab331e3c10956f8abc22c973df9c90;hpb=ad10aea1d685e67e0e639f6303fc9c8f8f1f945c;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 728098b93..78a5c440c 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -72,7 +72,7 @@ using boost::lexical_cast;
 /** @param f Film to edit */
 FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	: wxPanel (parent)
-	, _menu (f, this)
+	, _menu (this)
 	, _generally_sensitive (true)
 	, _timeline_dialog (0)
 {
@@ -177,7 +177,7 @@ FilmEditor::make_dcp_panel ()
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY);
 		s->Add (_j2k_bandwidth, 1);
-		add_label_to_sizer (s, _dcp_panel, _("MBps"), false);
+		add_label_to_sizer (s, _dcp_panel, _("Mbit/s"), false);
 		grid->Add (s, wxGBPosition (r, 1));
 	}
 	++r;
@@ -275,16 +275,16 @@ FilmEditor::make_content_panel ()
 		b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT);
 		_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
 		b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
-		_content_earlier = new wxButton (_content_panel, wxID_UP);
+		_content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up"));
 		b->Add (_content_earlier, 1, wxEXPAND);
-		_content_later = new wxButton (_content_panel, wxID_DOWN);
+		_content_later = new wxButton (_content_panel, wxID_ANY, _("Down"));
 		b->Add (_content_later, 1, wxEXPAND);
 		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
 		b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
 
 		s->Add (b, 0, wxALL, 4);
 
-		_content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
+		_content_sizer->Add (s, 0, wxEXPAND | wxALL, 6);
 	}
 
 	_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
@@ -734,7 +734,7 @@ FilmEditor::setup_content ()
 	ContentList content = _film->content ();
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 		int const t = _content->GetItemCount ();
-		bool const valid = (*i)->path_valid ();
+		bool const valid = (*i)->paths_valid ();
 
 		string s = (*i)->summary ();
 		if (!valid) {
@@ -841,7 +841,7 @@ FilmEditor::setup_content_sensitivity ()
 
 	_video_panel->Enable	(video_selection.size() > 0 && _generally_sensitive);
 	_audio_panel->Enable	(audio_selection.size() > 0 && _generally_sensitive);
-	_subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<FFmpegContent> (selection.front()) && _generally_sensitive);
+	_subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<SubtitleContent> (selection.front()) && _generally_sensitive);
 	_timing_panel->Enable	(selection.size() == 1 && _generally_sensitive);
 }
 
@@ -936,7 +936,7 @@ FilmEditor::content_timeline_clicked ()
 		_timeline_dialog = 0;
 	}
 	
-	_timeline_dialog = new DCPTimelineDialog (this, _film);
+	_timeline_dialog = new TimelineDialog (this, _film);
 	_timeline_dialog->Show ();
 }
 
@@ -966,7 +966,7 @@ FilmEditor::sequence_video_changed ()
 void
 FilmEditor::content_right_click (wxListEvent& ev)
 {
-	_menu.popup (selected_content (), ev.GetPoint ());
+	_menu.popup (_film, selected_content (), ev.GetPoint ());
 }
 
 void