X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_audio_stream.cc;h=1fc008d51a22cc5a621ea499fdf6d48d7f3528bb;hb=19f51503621a57794bd79bac053c9e6549a69f46;hp=255952b8fd02b366535c472823031f95f1ad97d1;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index 255952b8f..1fc008d51 100644
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -1,47 +1,59 @@
 /*
     Copyright (C) 2013-2014 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/>.
 
 */
 
+#include "ffmpeg_audio_stream.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
-#include "ffmpeg_audio_stream.h"
 
 using std::string;
+using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
 	: FFmpegStream (node)
-	, mapping (node->node_child ("Mapping"), version)
+	, AudioStream (
+		node->number_child<int> ("FrameRate"),
+		node->optional_number_child<Frame>("Length").get_value_or (0),
+		AudioMapping (node->node_child ("Mapping"), version)
+		)
 {
-	frame_rate = node->number_child<int> ("FrameRate");
-	channels = node->number_child<int64_t> ("Channels");
-	first_audio = node->optional_number_child<double> ("FirstAudio");
+	optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstAudio");
+	if (f) {
+		first_audio = ContentTime (f.get ());
+	}
+	codec_name = node->optional_string_child("CodecName");
 }
 
 void
 FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 {
 	FFmpegStream::as_xml (root);
-	root->add_child("FrameRate")->add_child_text (raw_convert<string> (frame_rate));
-	root->add_child("Channels")->add_child_text (raw_convert<string> (channels));
+	root->add_child("FrameRate")->add_child_text (raw_convert<string> (frame_rate ()));
+	root->add_child("Length")->add_child_text (raw_convert<string> (length ()));
+	mapping().as_xml (root->add_child("Mapping"));
 	if (first_audio) {
-		root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get()));
+		root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get ()));
+	}
+	if (codec_name) {
+		root->add_child("CodecName")->add_child_text (codec_name.get());
 	}
-	mapping.as_xml (root->add_child("Mapping"));
 }