X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=e5cb5371c533c62ed755bc736199150ef41d1847;hb=b8fb440b93ff5ee835249204bd5642cf95a4ac99;hp=bf13620e53bd31b62d099a7f6769e050504e05e6;hpb=bdbb254c18b100f8fa66a3707f6b515309d05685;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index bf13620e5..e5cb5371c 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)
 {
@@ -150,6 +150,10 @@ FilmEditor::make_dcp_panel ()
 	}
 	++r;
 
+	_signed = new wxCheckBox (_dcp_panel, wxID_ANY, _("Signed"));
+	grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+	
 	_encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, _("Encrypted"));
 	grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
@@ -238,6 +242,7 @@ FilmEditor::connect_to_widgets ()
 	_dcp_content_type->Bind	(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&FilmEditor::dcp_content_type_changed, this));
 	_frame_rate->Bind	(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&FilmEditor::frame_rate_changed, this));
 	_best_frame_rate->Bind	(wxEVT_COMMAND_BUTTON_CLICKED,	      boost::bind (&FilmEditor::best_frame_rate_clicked, this));
+	_signed->Bind           (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::signed_toggled, this));
 	_encrypted->Bind        (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::encrypted_toggled, this));
 	_audio_channels->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::audio_channels_changed, this));
 	_j2k_bandwidth->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
@@ -279,7 +284,7 @@ FilmEditor::make_content_panel ()
 
 		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"));
@@ -319,6 +324,16 @@ FilmEditor::j2k_bandwidth_changed ()
 	_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
 }
 
+void
+FilmEditor::signed_toggled ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_signed (_signed->GetValue ());
+}
+
 void
 FilmEditor::encrypted_toggled ()
 {
@@ -416,8 +431,17 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SCALER:
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
 		break;
+	case Film::SIGNED:
+		checked_set (_signed, _film->is_signed ());
+		break;
 	case Film::ENCRYPTED:
 		checked_set (_encrypted, _film->encrypted ());
+		if (_film->encrypted ()) {
+			_film->set_signed (true);
+			_signed->Enable (false);
+		} else {
+			_signed->Enable (_generally_sensitive);
+		}
 		break;
 	case Film::RESOLUTION:
 		checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
@@ -572,12 +596,12 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::RESOLUTION);
 	film_changed (Film::SCALER);
 	film_changed (Film::WITH_SUBTITLES);
+	film_changed (Film::SIGNED);
 	film_changed (Film::ENCRYPTED);
 	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
 	film_changed (Film::VIDEO_FRAME_RATE);
 	film_changed (Film::AUDIO_CHANNELS);
-	film_changed (Film::ENCRYPTED);
 	film_changed (Film::SEQUENCE_VIDEO);
 	film_changed (Film::THREE_D);
 	film_changed (Film::INTEROP);
@@ -606,6 +630,13 @@ FilmEditor::set_general_sensitivity (bool s)
 	_content_later->Enable (s);
 	_content_timeline->Enable (s);
 	_dcp_content_type->Enable (s);
+
+	bool si = s;
+	if (_film && _film->encrypted ()) {
+		si = false;
+	}
+	_signed->Enable (si);
+	
 	_encrypted->Enable (s);
 	_frame_rate->Enable (s);
 	_audio_channels->Enable (s);
@@ -703,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) {
@@ -747,7 +778,7 @@ FilmEditor::content_add_file_clicked ()
 	/* XXX: check for lots of files here and do something */
 
 	for (unsigned int i = 0; i < paths.GetCount(); ++i) {
-		_film->examine_and_add_content (content_factory (_film, wx_to_std (d->GetPath ())));
+		_film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
 	}
 
 	d->Destroy ();
@@ -905,7 +936,7 @@ FilmEditor::content_timeline_clicked ()
 		_timeline_dialog = 0;
 	}
 	
-	_timeline_dialog = new TimelineDialog (this, _film);
+	_timeline_dialog = new DCPTimelineDialog (this, _film);
 	_timeline_dialog->Show ();
 }
 
@@ -935,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