X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=4e9d5cd5cee5395b3a22058fd0cf6c08f57e1e57;hb=9c01623c3038b978ba732de2ad147d29fad60afe;hp=a89184de3a8848e60cf6d0cff652873a6fe3622a;hpb=5189e5720bd583dbf8a4a4e89c5a1b2e61c6d214;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index a89184de3..4e9d5cd5c 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -34,7 +35,6 @@
 using std::string;
 using std::cout;
 using std::vector;
-using std::stringstream;
 using std::fixed;
 using std::list;
 using std::pair;
@@ -57,8 +57,19 @@ AudioContent::AudioContent (Content* parent)
 }
 
 shared_ptr<AudioContent>
-AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node)
+AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
 {
+	if (version < 34) {
+		/* With old metadata FFmpeg content has the audio-related tags even with no
+		   audio streams, so check for that.
+		*/
+		if (node->string_child("Type") == "FFmpeg" && node->node_children("AudioStream").empty()) {
+			return shared_ptr<AudioContent> ();
+		}
+
+		/* Otherwise we can drop through to the newer logic */
+	}
+
 	if (!node->optional_number_child<double> ("AudioGain")) {
 		return shared_ptr<AudioContent> ();
 	}
@@ -291,34 +302,34 @@ AudioContent::add_properties (list<UserProperty>& p) const
 	}
 
 	if (stream) {
-		p.push_back (UserProperty (_("Audio"), _("Channels"), stream->channels ()));
-		p.push_back (UserProperty (_("Audio"), _("Content audio sample rate"), stream->frame_rate(), _("Hz")));
+		p.push_back (UserProperty (UserProperty::AUDIO, _("Channels"), stream->channels ()));
+		p.push_back (UserProperty (UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz")));
 	}
 
 	FrameRateChange const frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate());
 	ContentTime const c (_parent->full_length(), frc);
 
 	p.push_back (
-		UserProperty (_("Length"), _("Full length in video frames at content rate"), c.frames_round(frc.source))
+		UserProperty (UserProperty::LENGTH, _("Full length in video frames at content rate"), c.frames_round(frc.source))
 		);
 
 	if (stream) {
 		p.push_back (
 			UserProperty (
-				_("Length"),
+				UserProperty::LENGTH,
 				_("Full length in audio samples at content rate"),
 				c.frames_round (stream->frame_rate ())
 				)
 			);
 	}
 
-	p.push_back (UserProperty (_("Audio"), _("DCP frame rate"), resampled_frame_rate (), _("Hz")));
-	p.push_back (UserProperty (_("Length"), _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp)));
+	p.push_back (UserProperty (UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate (), _("Hz")));
+	p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp)));
 
 	if (stream) {
 		p.push_back (
 			UserProperty (
-				_("Length"),
+				UserProperty::LENGTH,
 				_("Full length in audio samples at DCP rate"),
 				c.frames_round (resampled_frame_rate ())
 				)