Merge master; specify libdcp-1.0.

4 files changed, 52 insertions, 6 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 5fa5014f0..d24032849 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -110,6 +110,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Mattias Mattsson"));
 	supported_by.Add (wxT ("Andrä Steiner"));
 	supported_by.Add (wxT ("Jonathan Jensen"));
+	supported_by.Add (wxT ("Mike Stiebing"));
 	supported_by.Add (wxT ("Kjarten Michaelsen"));
 	supported_by.Add (wxT ("Jussi Siponen"));
 	supported_by.Add (wxT ("Cinema Clarici"));
@@ -130,8 +131,41 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Sylvain Mielle"));
 	supported_by.Add (wxT ("Ivan Pullman"));
 	supported_by.Add (wxT ("Aldo Midali"));
+	supported_by.Add (wxT ("Jeff Boot"));
+	supported_by.Add (wxT ("Filip Kovcin"));
+	supported_by.Add (wxT ("Adam Colt"));
 	add_section (_("Supported by"), supported_by);
 
+	wxArrayString testers;
+	testers.Add (wxT ("Greg Rooke"));
+	testers.Add (wxT ("Olivier Lemaire"));
+	testers.Add (wxT ("Trever Anderson"));
+	testers.Add (wxT ("Wolfgang Woehl"));
+	testers.Add (wxT ("Jonathan Jensen"));
+	testers.Add (wxT ("Anders Nordentoft-Madsen"));
+	testers.Add (wxT ("Lilian Lefranc"));
+	testers.Add (wxT ("Gérald Maruccia"));
+	testers.Add (wxT ("John Convertino"));
+	testers.Add (wxT ("Mike Blakesley"));
+	testers.Add (wxT ("Simon Kesselman"));
+	testers.Add (wxT ("Gavin Lewarne"));
+	testers.Add (wxT ("Thierry Journet"));
+	testers.Add (wxT ("Carsten Kurz"));
+	testers.Add (wxT ("Karim Senoucci"));
+	testers.Add (wxT ("Paul Willmott"));
+	testers.Add (wxT ("Mattias Mattsson"));
+	testers.Add (wxT ("Andreas Eli"));
+	testers.Add (wxT ("Roop Chand"));
+	testers.Add (wxT ("Peter Puchner"));
+	testers.Add (wxT ("David Booty"));
+	testers.Add (wxT ("Maurizio Giampà"));
+	testers.Add (wxT ("Bill Lam"));
+	testers.Add (wxT ("Pepijn Klijs"));
+	testers.Add (wxT ("Will Meadows"));
+	testers.Add (wxT ("Adam Colt"));
+	testers.Add (wxT ("Markus Raab"));
+	add_section (_("Tested by"), testers);
+	
 	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
 
 	overall_sizer->Add (sizer);
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 75c8ea5de..86f039900 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -271,6 +271,10 @@ AudioMappingView::set_column_labels ()
 	int const c = _grid->GetNumberCols ();
 	
 	_grid->SetColLabelValue (0, _("Content channel"));
+
+#if MAX_AUDIO_CHANNELS != 8
+#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS
+#endif	
 	
 	if (c > 0) {
 		_grid->SetColLabelValue (1, _("L"));
@@ -296,6 +300,14 @@ AudioMappingView::set_column_labels ()
 		_grid->SetColLabelValue (6, _("Rs"));
 	}
 
+	if (c > 6) {
+		_grid->SetColLabelValue (7, _("HI"));
+	}
+
+	if (c > 7) {
+		_grid->SetColLabelValue (8, _("VI"));
+	}
+	
 	_grid->AutoSize ();
 }
 
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index ba458f1ff..0838fa8ab 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -134,11 +134,11 @@ AudioPanel::film_content_changed (int property)
 		if (fcs) {
 			vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
 			for (vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
-				_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+				_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ())));
 			}
 			
 			if (fcs->audio_stream()) {
-				checked_set (_stream, lexical_cast<string> (fcs->audio_stream()->id));
+				checked_set (_stream, fcs->audio_stream()->identifier ());
 				setup_stream_description ();
 			}
 		}
@@ -206,7 +206,7 @@ AudioPanel::stream_changed ()
 	vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
 	vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin ();
 	string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
-	while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+	while (i != a.end() && (*i)->identifier () != s) {
 		++i;
 	}
 
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 02c8776d6..63a18b0ce 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -120,11 +120,11 @@ SubtitlePanel::film_content_changed (int property)
 		if (fcs) {
 			vector<shared_ptr<FFmpegSubtitleStream> > s = fcs->subtitle_streams ();
 			for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
-				_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+				_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ())));
 			}
 			
 			if (fcs->subtitle_stream()) {
-				checked_set (_stream, lexical_cast<string> (fcs->subtitle_stream()->id));
+				checked_set (_stream, fcs->subtitle_stream()->identifier ());
 			} else {
 				_stream->SetSelection (wxNOT_FOUND);
 			}
@@ -179,7 +179,7 @@ SubtitlePanel::stream_changed ()
 	vector<shared_ptr<FFmpegSubtitleStream> > a = fcs->subtitle_streams ();
 	vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = a.begin ();
 	string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
-	while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+	while (i != a.end() && (*i)->identifier () != s) {
 		++i;
 	}