Merge master.

11 files changed, 57 insertions, 18 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 15b667f9b..1bbcaba79 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -165,6 +165,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Wolfram Weber"));
 	supported_by.Add (wxT ("Frank de Wulf"));
 	supported_by.Add (wxT ("Pavel Zhdanko"));
+	supported_by.Add (wxT ("Daniel Židek"));
 	add_section (_("Supported by"), supported_by);
 
 	wxArrayString tested_by;
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 82604763c..b7d6979d3 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -94,6 +94,15 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	
 	_mapping = new AudioMappingView (this);
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
+	++r;
+
+	_description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize);
+	_sizer->Add (_description, 0, wxALL, 12);
+	wxFont font = _description->GetFont();
+	font.SetStyle (wxFONTSTYLE_ITALIC);
+	font.SetPointSize (font.GetPointSize() - 1);
+	_description->SetFont (font);
+	++r;
 
 	_gain->wrapped()->SetRange (-60, 60);
 	_gain->wrapped()->SetDigits (1);
@@ -117,6 +126,9 @@ AudioPanel::film_changed (Film::Property property)
 		_mapping->set_channels (_parent->film()->audio_channels ());
 		_sizer->Layout ();
 		break;
+	case Film::VIDEO_FRAME_RATE:
+		setup_description ();
+		break;
 	default:
 		break;
 	}
@@ -136,6 +148,8 @@ AudioPanel::film_content_changed (int property)
 	if (property == AudioContentProperty::AUDIO_MAPPING) {
 		_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
 		_sizer->Layout ();
+	} else if (property == AudioContentProperty::AUDIO_FRAME_RATE) {
+		setup_description ();
 	} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
 		_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
 		_sizer->Layout ();
@@ -246,6 +260,27 @@ AudioPanel::processor_changed ()
 }
 
 void
+AudioPanel::setup_description ()
+{
+	AudioContentList ac = _parent->selected_audio ();
+	if (ac.size () != 1) {
+		_description->SetLabel ("");
+		return;
+	}
+
+	shared_ptr<AudioContent> acs = ac.front ();
+	if (acs->audio_frame_rate() != acs->resampled_audio_frame_rate ()) {
+		_description->SetLabel (wxString::Format (
+						_("Audio will be resampled from %.3fkHz to %.3fkHz."),
+						acs->audio_frame_rate() / 1000.0,
+						acs->resampled_audio_frame_rate() / 1000.0
+						));
+	} else {
+		_description->SetLabel (_("Audio will not be resampled."));
+	}
+}
+
+void
 AudioPanel::mapping_changed (AudioMapping m)
 {
 	AudioContentList c = _parent->selected_audio ();
@@ -276,6 +311,7 @@ AudioPanel::content_selection_changed ()
 
 	film_content_changed (AudioContentProperty::AUDIO_MAPPING);
 	film_content_changed (AudioContentProperty::AUDIO_PROCESSOR);
+	film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE);
 	film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
 	film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
 }
diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index d5821d26a..b0218575a 100644
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -44,6 +44,7 @@ private:
 	void mapping_changed (AudioMapping);
 	void processor_changed ();
 	void setup_processors ();
+	void setup_description ();
 
 	ContentSpinCtrlDouble<AudioContent>* _gain;
 	wxButton* _gain_calculate_button;
@@ -51,6 +52,8 @@ private:
 	ContentSpinCtrl<AudioContent>* _delay;
 	wxChoice* _stream;
 	wxChoice* _processor;
+	wxStaticText* _stream_description;
 	AudioMappingView* _mapping;
+	wxStaticText* _description;
 	AudioDialog* _audio_dialog;
 };
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 7ecba1903..a46983a6f 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -172,7 +172,7 @@ FilmViewer::get (DCPTime p, bool accurate)
 	list<shared_ptr<PlayerVideo> > pvf = _player->get_video (p, accurate);
 	if (!pvf.empty ()) {
 		try {
-			_frame = pvf.front()->image (true);
+			_frame = pvf.front()->image (PIX_FMT_RGB24, true);
 			_frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
 			_position = pvf.front()->time ();
 			_inter_position = pvf.front()->inter_position ();
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 5050abc0b..d7353e914 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-16 16:38+0100\n"
 "PO-Revision-Date: 2014-07-13 03:08+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1119,7 +1119,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:213
+#: src/wx/about_dialog.cc:210
 msgid "Tested by"
 msgstr "Getestet von"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index ea0ed5ab4..0191fc503 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -1109,7 +1109,7 @@ msgstr "Idioma del subtítulo (ej. EN)"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:168
+#: src/wx/about_dialog.cc:165
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -1134,7 +1134,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:213
+#: src/wx/about_dialog.cc:210
 msgid "Tested by"
 msgstr "Comprobado por"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index e4c2034ff..46c4822d6 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-16 16:38+0100\n"
 "PO-Revision-Date: 2014-07-14 11:27+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -1096,7 +1096,7 @@ msgstr "Langue de sous-titres (ex. FR)"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:168
+#: src/wx/about_dialog.cc:165
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -1120,7 +1120,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version test"
 
-#: src/wx/about_dialog.cc:213
+#: src/wx/about_dialog.cc:210
 msgid "Tested by"
 msgstr "Testé par"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 35c463d30..35cb8db88 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-16 16:38+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -1118,7 +1118,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:168
+#: src/wx/about_dialog.cc:165
 msgid "Supported by"
 msgstr ""
 
@@ -1144,7 +1144,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:213
+#: src/wx/about_dialog.cc:210
 msgid "Tested by"
 msgstr ""
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index aa609f1f0..e792f84be 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-16 16:38+0100\n"
 "PO-Revision-Date: 2014-09-04 20:17+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -1104,7 +1104,7 @@ msgstr "Ondertitel Taal (vb  NL)"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:168
+#: src/wx/about_dialog.cc:165
 msgid "Supported by"
 msgstr "Ondersteund door"
 
@@ -1128,7 +1128,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:213
+#: src/wx/about_dialog.cc:210
 msgid "Tested by"
 msgstr "Getest door"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 497b9a25d..441643cce 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-16 16:38+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -1131,7 +1131,7 @@ msgstr "Undertextspråk (ex. SV)"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:168
+#: src/wx/about_dialog.cc:165
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -1156,7 +1156,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:213
+#: src/wx/about_dialog.cc:210
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
diff --git a/src/wx/wscript b/src/wx/wscript
index 0f39038a5..8801ccc75 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -68,7 +68,6 @@ def configure(conf):
                                     'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
         conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
         if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE:
-            conf.env.LIB_WXWIDGETS.append('Xxf86vm')
             conf.env.LIB_WXWIDGETS.append('Xext')
             conf.env.LIB_WXWIDGETS.append('X11')