sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Just a function renamed

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-09-24 15:12:58 +02:00
parent 4a998cf6e7
commit 897477e140
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sfizz/Region.cpp
View file

@ -1183,7 +1183,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
case hash("ampeg_release_oncc&"): // also ampeg_releasecc& case hash("ampeg_release_oncc&"): // also ampeg_releasecc&
case hash("ampeg_start_oncc&"): // also ampeg_startcc& case hash("ampeg_start_oncc&"): // also ampeg_startcc&
case hash("ampeg_sustain_oncc&"): // also ampeg_sustaincc& case hash("ampeg_sustain_oncc&"): // also ampeg_sustaincc&
parseEGopcode(opcode, amplitudeEG); parseEGOpcode(opcode, amplitudeEG);
break; break;
case hash("pitcheg_attack"): case hash("pitcheg_attack"):
@ -1206,7 +1206,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
case hash("pitcheg_release_oncc&"): // also pitcheg_releasecc& case hash("pitcheg_release_oncc&"): // also pitcheg_releasecc&
case hash("pitcheg_start_oncc&"): // also pitcheg_startcc& case hash("pitcheg_start_oncc&"): // also pitcheg_startcc&
case hash("pitcheg_sustain_oncc&"): // also pitcheg_sustaincc& case hash("pitcheg_sustain_oncc&"): // also pitcheg_sustaincc&
if (parseEGopcode(opcode, pitchEG)) if (parseEGOpcode(opcode, pitchEG))
getOrCreateConnection( getOrCreateConnection(
ModKey::createNXYZ(ModId::PitchEG, id), ModKey::createNXYZ(ModId::PitchEG, id),
ModKey::createNXYZ(ModId::Pitch, id)); ModKey::createNXYZ(ModId::Pitch, id));
@ -1232,7 +1232,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
case hash("fileg_release_oncc&"): // also fileg_releasecc& case hash("fileg_release_oncc&"): // also fileg_releasecc&
case hash("fileg_start_oncc&"): // also fileg_startcc& case hash("fileg_start_oncc&"): // also fileg_startcc&
case hash("fileg_sustain_oncc&"): // also fileg_sustaincc& case hash("fileg_sustain_oncc&"): // also fileg_sustaincc&
if (parseEGopcode(opcode, filterEG)) if (parseEGOpcode(opcode, filterEG))
getOrCreateConnection( getOrCreateConnection(
ModKey::createNXYZ(ModId::FilEG, id), ModKey::createNXYZ(ModId::FilEG, id),
ModKey::createNXYZ(ModId::FilCutoff, id)); ModKey::createNXYZ(ModId::FilCutoff, id));
@ -1352,7 +1352,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
return true; return true;
} }
bool sfz::Region::parseEGopcode(const Opcode& opcode, EGDescription& eg) bool sfz::Region::parseEGOpcode(const Opcode& opcode, EGDescription& eg)
{ {
#define case_any_eg(param) \ #define case_any_eg(param) \
case hash("ampeg_" param): \ case hash("ampeg_" param): \
@ -1476,13 +1476,13 @@ bool sfz::Region::parseEGopcode(const Opcode& opcode, EGDescription& eg)
#undef case_any_eg #undef case_any_eg
} }
bool sfz::Region::parseEGopcode(const Opcode& opcode, absl::optional<EGDescription>& eg) bool sfz::Region::parseEGOpcode(const Opcode& opcode, absl::optional<EGDescription>& eg)
{ {
bool create = eg == absl::nullopt; bool create = eg == absl::nullopt;
if (create) if (create)
eg = EGDescription(); eg = EGDescription();
bool parsed = parseEGopcode(opcode, *eg); bool parsed = parseEGOpcode(opcode, *eg);
if (!parsed && create) if (!parsed && create)
eg = absl::nullopt; eg = absl::nullopt;

4
src/sfizz/Region.h
View file

@ -265,7 +265,7 @@ struct Region {
* @return true if the opcode was properly read and stored. * @return true if the opcode was properly read and stored.
* @return false * @return false
*/ */
bool parseEGopcode(const Opcode& opcode, EGDescription& eg); bool parseEGOpcode(const Opcode& opcode, EGDescription& eg);
/** /**
* @brief Parse a opcode which is specific to a particular SFZv1 EG: * @brief Parse a opcode which is specific to a particular SFZv1 EG:
* ampeg, pitcheg, fileg. * ampeg, pitcheg, fileg.
@ -275,7 +275,7 @@ struct Region {
* @return true if the opcode was properly read and stored. * @return true if the opcode was properly read and stored.
* @return false * @return false
*/ */
bool parseEGopcode(const Opcode& opcode, absl::optional<EGDescription>& eg); bool parseEGOpcode(const Opcode& opcode, absl::optional<EGDescription>& eg);
/** /**
* @brief Process a generic CC opcode, and fill the modulation parameters. * @brief Process a generic CC opcode, and fill the modulation parameters.
* *