Throw errors from CPLSummary constructor if the DCP::read reported any problems.

[dcpomatic.git] / src / lib / ffmpeg_audio_stream.cc

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index e0c8cae4c6496db66be03cfcb82fa0bc15c43d63..1fc008d51a22cc5a621ea499fdf6d48d7f3528bb 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -19,12 +19,14 @@
 */
 
 #include "ffmpeg_audio_stream.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
 using std::string;
 using boost::optional;
+using dcp::raw_convert;
+using namespace dcpomatic;
 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
        : FFmpegStream (node)
@@ -38,6 +40,7 @@ FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
        if (f) {
                first_audio = ContentTime (f.get ());
        }
+       codec_name = node->optional_string_child("CodecName");
 }
 
 void
@@ -50,4 +53,7 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
        if (first_audio) {
                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());
+       }
 }