Merge branch 'master' into subtitle-content

10 files changed, 67 insertions, 36 deletions

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index b672b2c1f..a6f9a17c3 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -556,7 +556,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 	   source that we may have chopped off for the DCP)
 	*/
 	double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset;
-	
+
 	/* hence start time for this sub */
 	Time const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
 	Time const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8586d4b73..1290cbda2 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -265,6 +265,14 @@ Film::make_dcp ()
 #else
 	log()->log ("libdcp built in optimised mode.");
 #endif
+
+#ifdef DCPOMATIC_WINDOWS
+	OSVERSIONINFO info;
+	info.dwOSVersionInfoSize = sizeof (info);
+	GetVersionEx (&info);
+	log()->log (String::compose ("Windows version %1.%2.%3 SP %4", info.dwMajorVersion, info.dwMinorVersion, info.dwBuildNumber, info.szCSDVersion));
+#endif	
+	
 	log()->log (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()));
 	list<pair<string, string> > const m = mount_info ();
 	for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 9f8599693..ce5109733 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -224,7 +224,8 @@ Player::pass ()
 				continue;
 			}
 
-			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+			shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+			if (ad && ad->has_audio ()) {
 				audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
 			}
 		}
@@ -292,6 +293,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 
 		pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
 	}
+		
 					    
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
@@ -683,8 +685,18 @@ Player::update_subtitle ()
 		_in_subtitle.image->pixel_format (),
 		true
 		);
-	_out_subtitle.from = _in_subtitle.from + piece->content->position ();
-	_out_subtitle.to = _in_subtitle.to + piece->content->position ();
+
+	/* XXX: hack */
+	Time from = _in_subtitle.from;
+	Time to = _in_subtitle.to;
+	shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (piece->content);
+	if (vc) {
+		from = rint (from * vc->video_frame_rate() / _film->video_frame_rate());
+		to = rint (to * vc->video_frame_rate() / _film->video_frame_rate());
+	}
+	
+	_out_subtitle.from = from * piece->content->position ();
+	_out_subtitle.to = to + piece->content->position ();
 }
 
 /** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 3d8a26f66..acb666099 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-07 20:01+0000\n"
-"PO-Revision-Date: 2014-01-05 23:06+0100\n"
+"PO-Revision-Date: 2014-01-14 19:45+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -603,7 +603,7 @@ msgstr "Bild-Decoder nicht gefunden"
 
 #: src/lib/writer.cc:387
 msgid "could not move audio MXF into the DCP (%1)"
-msgstr ""
+msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
 #: src/lib/sndfile_decoder.cc:45
 msgid "could not open audio file for reading"
diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 41abbb760..a47b2101e 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -32,11 +32,11 @@ vector<Ratio const *> Ratio::_ratios;
 void
 Ratio::setup_ratios ()
 {
-	_ratios.push_back (new Ratio (float(1285) / 1080, "119", _("1.19"), "F"));
-	_ratios.push_back (new Ratio (float(1436) / 1080, "133", _("4:3"), "F"));
+	_ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), "F"));
+	_ratios.push_back (new Ratio (float(1440) / 1080, "133", _("4:3"), "F"));
 	_ratios.push_back (new Ratio (float(1480) / 1080, "137", _("Academy"), "F"));
 	_ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.375"), "F"));
-	_ratios.push_back (new Ratio (float(1793) / 1080, "166", _("1.66"), "F"));
+	_ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), "F"));
 	_ratios.push_back (new Ratio (float(1920) / 1080, "178", _("16:9"), "F"));
 	_ratios.push_back (new Ratio (float(1998) / 1080, "185", _("Flat"), "F"));
 	_ratios.push_back (new Ratio (float(2048) /  858, "239", _("Scope"), "S"));
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 572a1c3a4..c2a6c981b 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -87,6 +87,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 
 	_picture_asset->set_edit_rate (_film->video_frame_rate ());
 	_picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ()));
+	_picture_asset->set_interop (_film->interop ());
 
 	if (_film->encrypted ()) {
 		_picture_asset->set_key (_film->key ());
@@ -98,6 +99,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 	_sound_asset->set_edit_rate (_film->video_frame_rate ());
 	_sound_asset->set_channels (_film->audio_channels ());
 	_sound_asset->set_sampling_rate (_film->audio_frame_rate ());
+	_sound_asset->set_interop (_film->interop ());
 
 	if (_film->encrypted ()) {
 		_sound_asset->set_key (_film->key ());
@@ -344,6 +346,10 @@ void
 Writer::terminate_thread (bool can_throw)
 {
 	boost::mutex::scoped_lock lock (_mutex);
+	if (_thread == 0) {
+		return;
+	}
+	
 	_finish = true;
 	_empty_condition.notify_all ();
 	_full_condition.notify_all ();
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 8604e2a4c..2de6cb871 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-07 20:01+0000\n"
-"PO-Revision-Date: 2014-01-02 13:17+0100\n"
+"PO-Revision-Date: 2014-01-14 19:49+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -86,7 +86,7 @@ msgstr "Über DCP-o-matic"
 
 #: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
-msgstr ""
+msgstr "Auf Updates überprüfen"
 
 #: src/tools/dcpomatic.cc:638
 msgid "Could not load film %1 (%2)"
@@ -111,7 +111,6 @@ msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
 #: src/tools/dcpomatic.cc:229
-#, fuzzy
 msgid "Encoding servers..."
 msgstr "Encoding Server..."
 
@@ -150,10 +149,12 @@ msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
 "using only has %.1f Gb available.  Do you want to continue anyway?"
 msgstr ""
+"Das DCP für diesen Film wird etwa %.1f GB groß. Auf dem ausgewählten "
+"Laufwerk sind aber nur %.1f GB frei. Möchten Sie trotzdem weitermachen ?"
 
 #: src/tools/dcpomatic.cc:729
 msgid "The DCP-o-matic download server could not be contacted."
-msgstr ""
+msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
 
 #: src/tools/dcpomatic.cc:356
 msgid ""
@@ -165,7 +166,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:724
 msgid "There are no new versions of DCP-o-matic available."
-msgstr ""
+msgstr "Es ist keine neue Version des DCP-o-matic verfügbar."
 
 #: src/tools/dcpomatic.cc:558
 msgid "There are unfinished jobs; are you sure you want to quit?"
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 9fa57a1b1..c08da0912 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -58,6 +58,8 @@ public:
 
 	void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
 	{
+		LocaleGuard lg;
+	
 		dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 1, wxPENSTYLE_SOLID));
 		dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID));
 		dc.DrawRectangle (rect);
@@ -222,6 +224,8 @@ AudioMappingView::set (AudioMapping map)
 void
 AudioMappingView::update_cells ()
 {
+	LocaleGuard lg;
+	
 	if (_grid->GetNumberRows ()) {
 		_grid->DeleteRows (0, _grid->GetNumberRows ());
 	}
diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index be5af999e..e0ad2c457 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -67,6 +67,8 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
+
+	_name->SetFocus ();
 }
 
 NewFilmDialog::~NewFilmDialog ()
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 5a1046524..58923196d 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-07 20:01+0000\n"
-"PO-Revision-Date: 2014-01-05 23:08+0100\n"
+"PO-Revision-Date: 2014-01-14 20:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -38,7 +38,7 @@ msgstr "(DCP-o-matic zum ändern der Sprache neu starten)"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "-3dB"
-msgstr ""
+msgstr "-3dB"
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
@@ -74,7 +74,7 @@ msgstr "4K"
 
 #: src/wx/update_dialog.cc:34
 msgid "A new version of DCP-o-matic is available."
-msgstr ""
+msgstr "Es ist eine neue Version von DCP-o-matic verfügbar."
 
 #: src/wx/about_dialog.cc:30
 msgid "About DCP-o-matic"
@@ -129,6 +129,7 @@ msgstr "Ton Kanäle"
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
+"Der Ton von Kanal %d wird ohne Veränderung an das DCP Kanal %d weitergegeben."
 
 #: src/wx/audio_mapping_view.cc:324
 #, c-format
@@ -136,6 +137,8 @@ msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
 "%.1fdB."
 msgstr ""
+"Der Ton von Kanal %d wird wird an das DCP Kanal %d mit %.1fdB Pegel "
+"weitergegeben."
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
@@ -167,9 +170,8 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/wx/audio_gain_dialog.cc:26
-#, fuzzy
 msgid "Channel gain"
-msgstr "Kanäle"
+msgstr "Kanal Pegel"
 
 #: src/wx/audio_dialog.cc:44
 msgid "Channels"
@@ -177,11 +179,11 @@ msgstr "Kanäle"
 
 #: src/wx/config_dialog.cc:143
 msgid "Check for testing updates as well as stable ones"
-msgstr ""
+msgstr "Überprüfung auf Updates auch für Test-Versionen."
 
 #: src/wx/config_dialog.cc:139
 msgid "Check for updates on startup"
-msgstr ""
+msgstr "Beim Starten auf Updates überprüfen."
 
 #: src/wx/content_menu.cc:182
 msgid "Choose a file"
@@ -349,9 +351,8 @@ msgid "Edit..."
 msgstr "Bearbeiten..."
 
 #: src/wx/cinema_dialog.cc:35
-#, fuzzy
 msgid "Email address for KDM delivery"
-msgstr "Von Adresse für KDM Emails"
+msgstr "Email Adresse für KDM Zustellung"
 
 #: src/wx/servers_list_dialog.cc:30
 msgid "Encoding Servers"
@@ -411,7 +412,7 @@ msgstr "Von Adresse für KDM Emails"
 
 #: src/wx/audio_mapping_view.cc:132
 msgid "Full"
-msgstr ""
+msgstr "Ein"
 
 #: src/wx/timing_panel.cc:42
 msgid "Full length"
@@ -424,7 +425,7 @@ msgstr "Lautstärken Rechner"
 #: src/wx/audio_gain_dialog.cc:31
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
-msgstr ""
+msgstr "Pegel des Kanals %d im DCP Kanal %d"
 
 #: src/wx/properties_dialog.cc:57
 msgid "Gb"
@@ -557,12 +558,12 @@ msgstr "Neuer Film"
 
 #: src/wx/update_dialog.cc:36
 msgid "New versions of DCP-o-matic are available."
-msgstr ""
+msgstr "Eine neue Version von DCP-o-matic ist verfügbar."
 
 #: src/wx/audio_mapping_view.cc:319
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
-msgstr ""
+msgstr "Der Ton von Kanal %d wird nicht an das DCP Kanal %d weitergegeben."
 
 #: src/wx/video_panel.cc:198
 msgid "No stretch"
@@ -574,7 +575,7 @@ msgstr "Kein"
 
 #: src/wx/audio_mapping_view.cc:131
 msgid "Off"
-msgstr ""
+msgstr "Aus"
 
 #: src/wx/config_dialog.cc:119
 msgid "Outgoing mail server"
@@ -668,7 +669,7 @@ msgstr "Neustart"
 
 #: src/wx/audio_mapping_view.cc:327
 msgid "Right click to change gain."
-msgstr ""
+msgstr "Rechtsklick für Pegeländerung"
 
 #: src/wx/video_panel.cc:101
 msgid "Right crop"
@@ -732,9 +733,8 @@ msgid "Snap"
 msgstr "Einschnappen"
 
 #: src/wx/update_dialog.cc:43
-#, fuzzy
 msgid "Stable version "
-msgstr "Inhalt Version"
+msgstr "Stabile Version"
 
 #: src/wx/film_editor.cc:185
 msgid "Standard"
@@ -781,9 +781,8 @@ msgid "Territory (e.g. UK)"
 msgstr "Gebiet (z.B. UK)"
 
 #: src/wx/update_dialog.cc:48
-#, fuzzy
 msgid "Test version "
-msgstr "Inhalt Version"
+msgstr "Test Version"
 
 #: src/wx/content_menu.cc:223
 msgid ""
@@ -853,7 +852,7 @@ msgstr "Nach oben"
 
 #: src/wx/update_dialog.cc:27
 msgid "Update"
-msgstr ""
+msgstr "Update"
 
 #: src/wx/film_editor.cc:126
 msgid "Use DCI name"
@@ -880,9 +879,8 @@ msgid "Video"
 msgstr "Bild"
 
 #: src/wx/timing_panel.cc:56
-#, fuzzy
 msgid "Video frame rate"
-msgstr "Bild Rate"
+msgstr "Bildwiederholrate"
 
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"