X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=1818fb451452233c196c534a7f996827d7a3b27d;hb=521c09170d9e62cd72cc2da66c41816761008a4b;hp=6a2aea18d0655d6cc36f163b09e238a0adf10b25;hpb=247b3423fcea1d4d20d797b48cdbaafa8dad1ea1;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 6a2aea18d..1818fb451 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -36,8 +36,7 @@
 #include "lib/filter.h"
 #include "lib/ratio.h"
 #include "lib/config.h"
-#include "lib/still_image_content.h"
-#include "lib/moving_image_content.h"
+#include "lib/image_content.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
@@ -151,7 +150,11 @@ FilmEditor::make_dcp_panel ()
 	}
 	++r;
 
-	_encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, wxT ("Encrypted"));
+	_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;
 
@@ -239,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));
@@ -280,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, 1, wxEXPAND | wxALL, 6);
 	}
 
 	_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
@@ -320,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 ()
 {
@@ -417,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);
@@ -573,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);
@@ -607,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);
@@ -704,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) {
@@ -731,7 +761,10 @@ FilmEditor::setup_content ()
 void
 FilmEditor::content_add_file_clicked ()
 {
-	wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+	/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
+	   non-Latin filenames or paths.
+	*/
+	wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR);
 	int const r = d->ShowModal ();
 
 	if (r != wxID_OK) {
@@ -745,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 ();
@@ -763,8 +796,8 @@ FilmEditor::content_add_folder_clicked ()
 	}
 
 	_film->examine_and_add_content (
-		shared_ptr<MovingImageContent> (
-			new MovingImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))
+		shared_ptr<ImageContent> (
+			new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))
 			)
 		);
 }
@@ -823,7 +856,9 @@ FilmEditor::selected_content ()
 			break;
 		}
 
-		sel.push_back (_film->content()[s]);
+		if (s < int (_film->content().size ())) {
+			sel.push_back (_film->content()[s]);
+		}
 	}
 
 	return sel;
@@ -901,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 ();
 }