X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=a252e4b5afae12c01c0f216afa2089144fa275cd;hb=fdcbd7eb473950f784fba05dcbf4bff115dbbd06;hp=2b402991cf3696d6a8f303369c8e1f16c624d427;hpb=31150ddd0fafac4426d11a758be9d77699b7377c;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 2b402991c..a252e4b5a 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -23,8 +23,8 @@
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"
-#include "raw_convert.h"
 #include "compose.hpp"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
@@ -35,7 +35,6 @@
 using std::string;
 using std::cout;
 using std::vector;
-using std::stringstream;
 using std::fixed;
 using std::list;
 using std::pair;
@@ -43,6 +42,7 @@ using std::setprecision;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using dcp::raw_convert;
 
 /** Something stream-related has changed */
 int const AudioContentProperty::STREAMS = 200;
@@ -58,8 +58,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> ();
 	}
@@ -124,9 +135,9 @@ AudioContent::set_delay (int d)
 string
 AudioContent::technical_summary () const
 {
-	string s = "audio :";
+	string s = "audio: ";
 	BOOST_FOREACH (AudioStreamPtr i, streams ()) {
-		s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate());
+		s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate());
 	}
 
 	return s;
@@ -239,14 +250,14 @@ AudioContent::processing_description () const
 	}
 
 	if (not_resampled && resampled) {
-		return String::compose (_("Some audio will be resampled to %1kHz"), resampled_frame_rate ());
+		return String::compose (_("Some audio will be resampled to %1Hz"), resampled_frame_rate ());
 	}
 
 	if (!not_resampled && resampled) {
 		if (same) {
-			return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_frame_rate ());
+			return String::compose (_("Audio will be resampled from %1Hz to %2Hz"), common_frame_rate.get(), resampled_frame_rate ());
 		} else {
-			return String::compose (_("Audio will be resampled to %1kHz"), resampled_frame_rate ());
+			return String::compose (_("Audio will be resampled to %1Hz"), resampled_frame_rate ());
 		}
 	}
 
@@ -313,7 +324,7 @@ AudioContent::add_properties (list<UserProperty>& p) const
 			);
 	}
 
-	p.push_back (UserProperty (UserProperty::AUDIO, _("DCP frame rate"), resampled_frame_rate (), _("Hz")));
+	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) {
@@ -368,3 +379,19 @@ AudioContent::set_stream (AudioStreamPtr stream)
 
 	_parent->signal_changed (AudioContentProperty::STREAMS);
 }
+
+void
+AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
+{
+	set_gain (c->_gain);
+	set_delay (c->_delay);
+
+	size_t i = 0;
+	size_t j = 0;
+
+	while (i < _streams.size() && j < c->_streams.size()) {
+		_streams[i]->set_mapping (c->_streams[j]->mapping());
+		++i;
+		++j;
+	}
+}