Merge branch '1.0' into 1.0-3D-take2

3 files changed, 53 insertions, 44 deletions

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ea32d102d..8329cad65 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -383,7 +383,13 @@ FFmpegDecoder::decode_audio_packet ()
 						audio (silence, _audio_position);
 					}
 				}
-					
+
+				int const data_size = av_samples_get_buffer_size (
+					0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
+					);
+
+				audio (deinterleave_audio (_frame->data, data_size), _audio_position);
+				
 				copy_packet.data += decode_result;
 				copy_packet.size -= decode_result;
 			}
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 5ccc12b61..e9ea3e3c7 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -122,7 +122,6 @@ Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node
 	}
 
 	reconnect ();
-	_sequence_video = node->bool_child ("SequenceVideo");
 }
 
 /** @param node <Playlist> node */
@@ -132,8 +131,6 @@ Playlist::as_xml (xmlpp::Node* node)
 	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
 		(*i)->as_xml (node->add_child ("Content"));
 	}
-
-	node->add_child("SequenceVideo")->add_child_text(_sequence_video ? "1" : "0");
 }
 
 void
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index a9200ac7d..3807b5346 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-15 22:07+0100\n"
-"PO-Revision-Date: 2013-05-21 10:30+0100\n"
+"PO-Revision-Date: 2013-07-16 23:11+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: \n"
@@ -18,16 +18,15 @@ msgstr ""
 
 #: src/lib/sndfile_content.cc:70
 msgid "%1 channels, %2kHz, %3 samples"
-msgstr ""
+msgstr "%1 canaux, %2kHz, %3 samples"
 
 #: src/lib/ffmpeg_content.cc:193
-#, fuzzy
 msgid "%1 frames; %2 frames per second"
-msgstr "images par seconde"
+msgstr "%1 images ; %2 images par seconde"
 
 #: src/lib/video_content.cc:131
 msgid "%1x%2 pixels (%3:1)"
-msgstr ""
+msgstr "%1x%2 pixels (%3:1)"
 
 #: src/lib/transcode_job.cc:81
 msgid "0%"
@@ -138,14 +137,24 @@ msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
-#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
+#: src/lib/filter.cc:68
+#: src/lib/filter.cc:69
+#: src/lib/filter.cc:70
+#: src/lib/filter.cc:71
+#: src/lib/filter.cc:72
+#: src/lib/filter.cc:73
 msgid "De-blocking"
 msgstr "De-bloc"
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
-#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
+#: src/lib/filter.cc:75
+#: src/lib/filter.cc:76
+#: src/lib/filter.cc:77
+#: src/lib/filter.cc:78
+#: src/lib/filter.cc:79
+#: src/lib/filter.cc:80
+#: src/lib/filter.cc:81
+#: src/lib/filter.cc:82
+#: src/lib/filter.cc:83
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
@@ -207,7 +216,7 @@ msgstr "Forcer la quantification"
 
 #: src/lib/ratio.cc:55
 msgid "Full frame"
-msgstr ""
+msgstr "Pleine matrice"
 
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
@@ -231,15 +240,12 @@ msgstr "Filtre dé-bloc horizontal"
 
 #: src/lib/imagemagick_content.cc:50
 msgid "Image: %1"
-msgstr ""
+msgstr "Image : %1"
 
-#: src/lib/job.cc:96 src/lib/job.cc:105
-msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
-msgstr ""
-"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
-"(dcpomatic@carlh.net)"
+#: src/lib/job.cc:96
+#: src/lib/job.cc:105
+msgid "It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
+msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
@@ -273,8 +279,11 @@ msgstr "Désentrelaceur linéaire interpolé"
 msgid "Median deinterlacer"
 msgstr "Désentrelaceur médian"
 
-#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
-#: src/lib/filter.cc:87 src/lib/filter.cc:90
+#: src/lib/filter.cc:74
+#: src/lib/filter.cc:85
+#: src/lib/filter.cc:86
+#: src/lib/filter.cc:87
+#: src/lib/filter.cc:90
 msgid "Misc"
 msgstr "Divers"
 
@@ -284,9 +293,11 @@ msgstr "Désentrelaceur par compensation de mouvement"
 
 #: src/lib/ffmpeg_content.cc:181
 msgid "Movie: %1"
-msgstr ""
+msgstr "Film : %1"
 
-#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
+#: src/lib/filter.cc:84
+#: src/lib/filter.cc:88
+#: src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
@@ -336,9 +347,8 @@ msgid "Sinc"
 msgstr "Sinc"
 
 #: src/lib/sndfile_content.cc:57
-#, fuzzy
 msgid "Sound file: %1"
-msgstr "lecture du fichier (%1) impossible"
+msgstr "Fichier son : %1"
 
 #: src/lib/scaler.cc:68
 msgid "Spline"
@@ -361,19 +371,12 @@ msgid "Test"
 msgstr "Test"
 
 #: src/lib/job.cc:78
-msgid ""
-"The drive that the film is stored on is low in disc space.  Free some more "
-"space and try again."
-msgstr ""
-"Le disque contenant le film est plein. Libérez de l'espace et essayez à "
-"nouveau."
+msgid "The drive that the film is stored on is low in disc space.  Free some more space and try again."
+msgstr "Le disque contenant le film est plein. Libérez de l'espace et essayez à nouveau."
 
 #: src/lib/film.cc:364
-msgid ""
-"This film was created with an older version of DCP-o-matic, and "
-"unfortunately it cannot be loaded into this version.  You will need to "
-"create a new Film, re-add your content and set it up again.  Sorry!"
-msgstr ""
+msgid "This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version.  You will need to create a new Film, re-add your content and set it up again.  Sorry!"
+msgstr "Ce projet a été créé avec une ancienne version de DCP-o-matic, chargement impossible. Créez un nouveau projet, ajoutez du contenu et  reparamétrez. Désolé !"
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
@@ -421,7 +424,7 @@ msgstr "Un autre filtre de désentrelacement"
 
 #: src/lib/film.cc:273
 msgid "You must add some content to the DCP before creating it"
-msgstr ""
+msgstr "Ajoutez un contenu pour créer le DCP"
 
 #: src/lib/film.cc:232
 msgid "cannot contain slashes"
@@ -485,7 +488,8 @@ msgstr "lecture du fichier impossible"
 msgid "could not read from file %1 (%2)"
 msgstr "lecture du fichier impossible %1 (%2)"
 
-#: src/lib/resampler.cc:76 src/lib/resampler.cc:96
+#: src/lib/resampler.cc:76
+#: src/lib/resampler.cc:96
 msgid "could not run sample-rate converter"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
@@ -509,7 +513,8 @@ msgstr "images par seconde"
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:143 src/lib/util.cc:148
+#: src/lib/util.cc:143
+#: src/lib/util.cc:148
 msgid "hours"
 msgstr "heures"
 
@@ -533,7 +538,8 @@ msgstr "paramètre %1 manquant"
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:232 src/lib/film.cc:281
+#: src/lib/film.cc:232
+#: src/lib/film.cc:281
 msgid "name"
 msgstr "nom"