X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsound_asset_writer.cc;h=5157bc9f786f9a72d1b3e622027089a404ef6e82;hb=274dd30f2b11fe8ea563a2ac7436c9d463865b0b;hp=0d7d20744b0f1c961f6ab8633d8032511bdaa6bf;hpb=4bd57fbbac67ac04ec47a9765b9f278aa1691851;p=libdcp.git diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc index 0d7d2074..5157bc9f 100644 --- a/src/sound_asset_writer.cc +++ b/src/sound_asset_writer.cc @@ -38,14 +38,17 @@ #include "bitstream.h" -#include "sound_asset_writer.h" -#include "sound_asset.h" -#include "exceptions.h" -#include "dcp_assert.h" #include "compose.hpp" #include "crypto_context.h" +#include "dcp_assert.h" +#include "exceptions.h" +#include "sound_asset.h" +#include "sound_asset_writer.h" +#include "warnings.h" +LIBDCP_DISABLE_WARNINGS #include #include +LIBDCP_ENABLE_WARNINGS #include @@ -136,11 +139,15 @@ SoundAssetWriter::start () if (field == MCASoundField::SEVEN_POINT_ONE) { soundfield->MCATagSymbol = "sg71"; soundfield->MCATagName = "7.1DS"; +LIBDCP_DISABLE_WARNINGS soundfield->MCALabelDictionaryID = asdcp_smpte_dict->ul(ASDCP::MDD_DCAudioSoundfield_71); +LIBDCP_ENABLE_WARNINGS } else { soundfield->MCATagSymbol = "sg51"; soundfield->MCATagName = "5.1"; +LIBDCP_DISABLE_WARNINGS soundfield->MCALabelDictionaryID = asdcp_smpte_dict->ul(ASDCP::MDD_DCAudioSoundfield_51); +LIBDCP_ENABLE_WARNINGS } _state->mxf_writer.OP1aHeader().AddChildObject(soundfield); @@ -167,7 +174,9 @@ SoundAssetWriter::start () if (auto lang = _asset->language()) { channel->RFC5646SpokenLanguage = *lang; } +LIBDCP_DISABLE_WARNINGS channel->MCALabelDictionaryID = channel_to_mca_universal_label(dcp_channel, field, asdcp_smpte_dict); +LIBDCP_ENABLE_WARNINGS _state->mxf_writer.OP1aHeader().AddChildObject(channel); essence_descriptor->SubDescriptors.push_back(channel->InstanceUID); }