X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_audio_stream.cc;h=d8666e89e44416e611e693a273b2ce9884c2b296;hb=cf8bbea2de38c4e9ac140f55b27311b7b6dcd814;hp=255952b8fd02b366535c472823031f95f1ad97d1;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;p=dcpomatic.git diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc index 255952b8f..d8666e89e 100644 --- a/src/lib/ffmpeg_audio_stream.cc +++ b/src/lib/ffmpeg_audio_stream.cc @@ -27,10 +27,10 @@ using dcp::raw_convert; FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version) : FFmpegStream (node) - , mapping (node->node_child ("Mapping"), version) + , _frame_rate (node->number_child ("FrameRate")) + , _channels (node->number_child ("Channels")) + , _mapping (node->node_child ("Mapping"), version) { - frame_rate = node->number_child ("FrameRate"); - channels = node->number_child ("Channels"); first_audio = node->optional_number_child ("FirstAudio"); } @@ -38,10 +38,10 @@ void FFmpegAudioStream::as_xml (xmlpp::Node* root) const { FFmpegStream::as_xml (root); - root->add_child("FrameRate")->add_child_text (raw_convert (frame_rate)); - root->add_child("Channels")->add_child_text (raw_convert (channels)); + root->add_child("FrameRate")->add_child_text (raw_convert (_frame_rate)); + root->add_child("Channels")->add_child_text (raw_convert (_channels)); if (first_audio) { root->add_child("FirstAudio")->add_child_text (raw_convert (first_audio.get().get())); } - mapping.as_xml (root->add_child("Mapping")); + _mapping.as_xml (root->add_child("Mapping")); }