diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
| commit | 76e3325a16cdf6d7220a61e2b5cfdb9c804cc32c (patch) | |
| tree | 8c1b5e5dc2cec265469a0d8018b6d7396b089432 /src/sound_asset_writer.cc | |
| parent | 6c3db78c3d20ef064fa2a0ef38e65ca1ae69adb3 (diff) | |
Use enum class for the things in types.h
Diffstat (limited to 'src/sound_asset_writer.cc')
| -rw-r--r-- | src/sound_asset_writer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc index 092acf0c..87de1b18 100644 --- a/src/sound_asset_writer.cc +++ b/src/sound_asset_writer.cc @@ -69,7 +69,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path f , _active_channels (active_channels) { DCP_ASSERT (!_sync || _asset->channels() >= 14); - DCP_ASSERT (!_sync || _asset->standard() == SMPTE); + DCP_ASSERT (!_sync || _asset->standard() == Standard::SMPTE); /* Derived from ASDCP::Wav::SimpleWaveHeader::FillADesc */ _state->desc.EditRate = ASDCP::Rational (_asset->edit_rate().numerator, _asset->edit_rate().denominator); @@ -80,7 +80,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path f _state->desc.BlockAlign = 3 * _asset->channels(); _state->desc.AvgBps = _asset->sampling_rate() * _state->desc.BlockAlign; _state->desc.LinkedTrackID = 0; - if (asset->standard() == INTEROP) { + if (asset->standard() == Standard::INTEROP) { _state->desc.ChannelFormat = ASDCP::PCM::CF_NONE; } else { /* Just use WTF ("wild track format") for SMPTE for now; searches suggest that this @@ -114,7 +114,7 @@ SoundAssetWriter::start () boost::throw_exception (FileError ("could not open audio MXF for writing", _file.string(), r)); } - if (_asset->standard() == dcp::SMPTE && !_active_channels.empty()) { + if (_asset->standard() == Standard::SMPTE && !_active_channels.empty()) { ASDCP::MXF::WaveAudioDescriptor* essence_descriptor = 0; _state->mxf_writer.OP1aHeader().GetMDObjectByType( @@ -127,9 +127,9 @@ SoundAssetWriter::start () GenRandomValue (soundfield->MCALinkID); soundfield->RFC5646SpokenLanguage = _asset->language(); - const MCASoundField field = _asset->channels() > 10 ? SEVEN_POINT_ONE : FIVE_POINT_ONE; + const MCASoundField field = _asset->channels() > 10 ? MCASoundField::SEVEN_POINT_ONE : MCASoundField::FIVE_POINT_ONE; - if (field == SEVEN_POINT_ONE) { + if (field == MCASoundField::SEVEN_POINT_ONE) { soundfield->MCATagSymbol = "sg71"; soundfield->MCATagName = "7.1DS"; soundfield->MCALabelDictionaryID = asdcp_smpte_dict->ul(ASDCP::MDD_DCAudioSoundfield_71); |