diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:35 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:35 +0200 |
| commit | 8963f0007af1a312017b9627c18b82ec2a577591 (patch) | |
| tree | baeb6f2c17da72248408b8c1d695242b44edda9e /src/lib/ffmpeg_audio_stream.cc | |
| parent | 29f84e2b8785585885e0658bdf9938967547460f (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/ffmpeg_audio_stream.cc')
| -rw-r--r-- | src/lib/ffmpeg_audio_stream.cc | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc index 32828f13a..91020e288 100644 --- a/src/lib/ffmpeg_audio_stream.cc +++ b/src/lib/ffmpeg_audio_stream.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "ffmpeg_audio_stream.h" #include <dcp/raw_convert.h> #include "warnings.h" @@ -26,37 +27,40 @@ DCPOMATIC_DISABLE_WARNINGS DCPOMATIC_ENABLE_WARNINGS #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) , AudioStream ( - node->number_child<int> ("FrameRate"), - node->optional_number_child<Frame>("Length").get_value_or (0), - AudioMapping (node->node_child ("Mapping"), version) + node->number_child<int>("FrameRate"), + node->optional_number_child<Frame>("Length").get_value_or(0), + AudioMapping (node->node_child("Mapping"), version) ) { - optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstAudio"); + optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type>("FirstAudio"); if (f) { - first_audio = ContentTime (f.get ()); + 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("Length")->add_child_text (raw_convert<string> (length ())); + 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()); + root->add_child("CodecName")->add_child_text(codec_name.get()); } } |