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

Allow OpcodeSpec to process enums too

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-04-15 17:00:51 +02:00
parent 343350ad96
commit dee8934b9e
4 changed files with 83 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Defaults.h
View file

@ -70,7 +70,7 @@ struct OpcodeSpec
int flags; int flags;
using Intermediate = typename std::conditional< using Intermediate = typename std::conditional<
std::is_integral<T>::value, int64_t, T>::type; std::is_integral<T>::value || std::is_enum<T>::value, int64_t, T>::type;
template <class U> template <class U>
using IsNormalizable = std::integral_constant< using IsNormalizable = std::integral_constant<

84
src/sfizz/Opcode.cpp
View file

@ -189,12 +189,12 @@ absl::optional<T> readInt_(OpcodeSpec<T> spec, absl::string_view v)
#define INSTANTIATE_FOR_INTEGRAL(T) \ #define INSTANTIATE_FOR_INTEGRAL(T) \
template <> \ template <> \
absl::optional<T> Opcode::readOptional(OpcodeSpec<T> spec) const \ absl::optional<T> Opcode::readOptional(OpcodeSpec<T> spec, absl::string_view value) \
{ \ { \
return readInt_<T>(spec, value); \ return readInt_<T>(spec, value); \
} \ } \
template <> \ template <> \
absl::optional<T> Opcode::transformOptional(OpcodeSpec<T> spec, int64_t value) const \ absl::optional<T> Opcode::transformOptional(OpcodeSpec<T> spec, int64_t value) \
{ \ { \
return transformInt_<T>(spec, value); \ return transformInt_<T>(spec, value); \
} }
@ -241,12 +241,12 @@ absl::optional<T> readFloat_(OpcodeSpec<T> spec, absl::string_view v)
#define INSTANTIATE_FOR_FLOATING_POINT(T) \ #define INSTANTIATE_FOR_FLOATING_POINT(T) \
template <> \ template <> \
absl::optional<T> Opcode::readOptional(OpcodeSpec<T> spec) const \ absl::optional<T> Opcode::readOptional(OpcodeSpec<T> spec, absl::string_view value) \
{ \ { \
return readFloat_<T>(spec, value); \ return readFloat_<T>(spec, value); \
} \ } \
template <> \ template <> \
absl::optional<T> Opcode::transformOptional(OpcodeSpec<T> spec, T value) const \ absl::optional<T> Opcode::transformOptional(OpcodeSpec<T> spec, T value) \
{ \ { \
return transformFloat_<T>(spec, value); \ return transformFloat_<T>(spec, value); \
} }
@ -304,19 +304,19 @@ absl::optional<uint8_t> readNoteValue(absl::string_view value)
return static_cast<uint8_t>(noteNumber); return static_cast<uint8_t>(noteNumber);
} }
absl::optional<bool> readBooleanFromOpcode(const Opcode& opcode) absl::optional<bool> readBoolean(absl::string_view value)
{ {
// Cakewalk-style booleans, case-insensitive // Cakewalk-style booleans, case-insensitive
if (absl::EqualsIgnoreCase(opcode.value, "off")) if (absl::EqualsIgnoreCase(value, "off"))
return false; return false;
if (absl::EqualsIgnoreCase(opcode.value, "on")) if (absl::EqualsIgnoreCase(value, "on"))
return true; return true;
// ARIA-style booleans? (seen in egN_dynamic=1 for example) // ARIA-style booleans? (seen in egN_dynamic=1 for example)
// TODO check this // TODO check this
const OpcodeSpec<int64_t> fullInt64 { 0, Range<int64_t>::wholeRange(), 0 }; const OpcodeSpec<int64_t> fullInt64 { 0, Range<int64_t>::wholeRange(), 0 };
const auto v = opcode.readOptional(fullInt64); const auto v = Opcode::readOptional(fullInt64, value);
if (v) if (v)
return v != 0; return v != 0;
@ -325,17 +325,37 @@ absl::optional<bool> readBooleanFromOpcode(const Opcode& opcode)
} }
template <> template <>
absl::optional<OscillatorEnabled> Opcode::readOptional(OpcodeSpec<OscillatorEnabled>) const absl::optional<OscillatorEnabled> Opcode::readOptional(OpcodeSpec<OscillatorEnabled>, absl::string_view value)
{ {
auto v = readBooleanFromOpcode(*this); auto v = readBoolean(value);
if (!v) if (!v)
return absl::nullopt; return absl::nullopt;
return *v ? OscillatorEnabled::On : OscillatorEnabled::Off; return *v ? OscillatorEnabled::On : OscillatorEnabled::Off;
} }
template <class E>
absl::optional<E> transformEnum_(OpcodeSpec<E> spec, int64_t value)
{
OpcodeSpec<int64_t> intermediateSpec;
intermediateSpec.defaultInputValue = static_cast<int64_t>(spec.defaultInputValue);
intermediateSpec.bounds = spec.bounds.template to<int64_t>();
intermediateSpec.flags = static_cast<int64_t>(spec.flags);
absl::optional<int64_t> intermediateValue = transformInt_(intermediateSpec, value);
if (!intermediateValue)
return absl::nullopt;
return static_cast<E>(*intermediateValue);
}
#define INSTANTIATE_FOR_ENUM(T) \
template <> \
absl::optional<T> Opcode::transformOptional(OpcodeSpec<T> spec, int64_t value) \
{ \
return transformEnum_<T>(spec, static_cast<int64_t>(value)); \
}
template <> template <>
absl::optional<Trigger> Opcode::readOptional(OpcodeSpec<Trigger>) const absl::optional<Trigger> Opcode::readOptional(OpcodeSpec<Trigger>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("attack"): return Trigger::attack; case hash("attack"): return Trigger::attack;
@ -349,8 +369,10 @@ absl::optional<Trigger> Opcode::readOptional(OpcodeSpec<Trigger>) const
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(Trigger)
template <> template <>
absl::optional<CrossfadeCurve> Opcode::readOptional(OpcodeSpec<CrossfadeCurve>) const absl::optional<CrossfadeCurve> Opcode::readOptional(OpcodeSpec<CrossfadeCurve>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("power"): return CrossfadeCurve::power; case hash("power"): return CrossfadeCurve::power;
@ -361,8 +383,10 @@ absl::optional<CrossfadeCurve> Opcode::readOptional(OpcodeSpec<CrossfadeCurve>)
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(CrossfadeCurve)
template <> template <>
absl::optional<OffMode> Opcode::readOptional(OpcodeSpec<OffMode>) const absl::optional<OffMode> Opcode::readOptional(OpcodeSpec<OffMode>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("fast"): return OffMode::fast; case hash("fast"): return OffMode::fast;
@ -374,8 +398,10 @@ absl::optional<OffMode> Opcode::readOptional(OpcodeSpec<OffMode>) const
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(OffMode)
template <> template <>
absl::optional<FilterType> Opcode::readOptional(OpcodeSpec<FilterType>) const absl::optional<FilterType> Opcode::readOptional(OpcodeSpec<FilterType>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("lpf_1p"): return kFilterLpf1p; case hash("lpf_1p"): return kFilterLpf1p;
@ -407,8 +433,10 @@ absl::optional<FilterType> Opcode::readOptional(OpcodeSpec<FilterType>) const
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(FilterType)
template <> template <>
absl::optional<EqType> Opcode::readOptional(OpcodeSpec<EqType>) const absl::optional<EqType> Opcode::readOptional(OpcodeSpec<EqType>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("peak"): return kEqPeak; case hash("peak"): return kEqPeak;
@ -420,8 +448,10 @@ absl::optional<EqType> Opcode::readOptional(OpcodeSpec<EqType>) const
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(EqType)
template <> template <>
absl::optional<VelocityOverride> Opcode::readOptional(OpcodeSpec<VelocityOverride>) const absl::optional<VelocityOverride> Opcode::readOptional(OpcodeSpec<VelocityOverride>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("current"): return VelocityOverride::current; case hash("current"): return VelocityOverride::current;
@ -432,8 +462,10 @@ absl::optional<VelocityOverride> Opcode::readOptional(OpcodeSpec<VelocityOverrid
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(VelocityOverride)
template <> template <>
absl::optional<SelfMask> Opcode::readOptional(OpcodeSpec<SelfMask>) const absl::optional<SelfMask> Opcode::readOptional(OpcodeSpec<SelfMask>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("on"): case hash("on"):
@ -445,8 +477,10 @@ absl::optional<SelfMask> Opcode::readOptional(OpcodeSpec<SelfMask>) const
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(SelfMask)
template <> template <>
absl::optional<LoopMode> Opcode::readOptional(OpcodeSpec<LoopMode>) const absl::optional<LoopMode> Opcode::readOptional(OpcodeSpec<LoopMode>, absl::string_view value)
{ {
switch (hash(value)) { switch (hash(value)) {
case hash("no_loop"): return LoopMode::no_loop; case hash("no_loop"): return LoopMode::no_loop;
@ -459,14 +493,16 @@ absl::optional<LoopMode> Opcode::readOptional(OpcodeSpec<LoopMode>) const
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(LoopMode)
template <> template <>
absl::optional<bool> Opcode::readOptional(OpcodeSpec<bool>) const absl::optional<bool> Opcode::readOptional(OpcodeSpec<bool>, absl::string_view value)
{ {
return readBooleanFromOpcode(*this); return readBoolean(value);
} }
template <> template <>
absl::optional<LFOWave> Opcode::readOptional(OpcodeSpec<LFOWave> spec) const absl::optional<LFOWave> Opcode::readOptional(OpcodeSpec<LFOWave> spec, absl::string_view value)
{ {
const OpcodeSpec<int> intSpec { const OpcodeSpec<int> intSpec {
static_cast<int>(spec.defaultInputValue), static_cast<int>(spec.defaultInputValue),
@ -474,12 +510,14 @@ absl::optional<LFOWave> Opcode::readOptional(OpcodeSpec<LFOWave> spec) const
0 0
}; };
if (auto value = readOptional(intSpec)) if (auto intValue = readOptional(intSpec, value))
return static_cast<LFOWave>(*value); return static_cast<LFOWave>(*intValue);
return absl::nullopt; return absl::nullopt;
} }
INSTANTIATE_FOR_ENUM(LFOWave)
} // namespace sfz } // namespace sfz
std::ostream &operator<<(std::ostream &os, const sfz::Opcode &opcode) std::ostream &operator<<(std::ostream &os, const sfz::Opcode &opcode)

19
src/sfizz/Opcode.h
View file

@ -107,19 +107,28 @@ struct Opcode {
category == kOpcodeStepCcN || category == kOpcodeSmoothCcN; category == kOpcodeStepCcN || category == kOpcodeSmoothCcN;
} }
///
template <class T> template <class T>
absl::optional<T> readOptional(OpcodeSpec<T> spec) const; absl::optional<T> readOptional(OpcodeSpec<T> spec) const { return readOptional(spec, value); }
template <class T> template <class T>
T read(OpcodeSpec<T> spec) const { return readOptional(spec).value_or(spec); } T read(OpcodeSpec<T> spec) const { return readOptional(spec, value).value_or(spec); }
///
template <class T>
static absl::optional<T> readOptional(OpcodeSpec<T> spec, absl::string_view value);
template <class T>
static T read(OpcodeSpec<T> spec, absl::string_view value) { return readOptional(spec, value).value_or(spec); }
///
template <class T> using Intermediate = typename OpcodeSpec<T>::Intermediate; template <class T> using Intermediate = typename OpcodeSpec<T>::Intermediate;
template <class T> template <class T>
absl::optional<T> transformOptional(OpcodeSpec<T> spec, Intermediate<T> value) const; static absl::optional<T> transformOptional(OpcodeSpec<T> spec, Intermediate<T> value);
template <class T> template <class T>
T transform(OpcodeSpec<T> spec, Intermediate<T> value) const { return transformOptional(spec, value).value_or(spec); } static T transform(OpcodeSpec<T> spec, Intermediate<T> value) { return transformOptional(spec, value).value_or(spec); }
private: private:
static OpcodeCategory identifyCategory(absl::string_view name); static OpcodeCategory identifyCategory(absl::string_view name);
@ -137,7 +146,7 @@ absl::optional<uint8_t> readNoteValue(absl::string_view value);
/** /**
* @brief Read a boolean value from the sfz file and cast it to the destination parameter. * @brief Read a boolean value from the sfz file and cast it to the destination parameter.
*/ */
absl::optional<bool> readBooleanFromOpcode(const Opcode& opcode); absl::optional<bool> readBoolean(absl::string_view value);
} }

14
tests/OpcodeT.cpp
View file

@ -509,11 +509,11 @@ TEST_CASE("[Opcode] opcode read (float)")
TEST_CASE("[Opcode] readBooleanFromOpcode") TEST_CASE("[Opcode] readBooleanFromOpcode")
{ {
REQUIRE(readBooleanFromOpcode({"", "1"}) == true); REQUIRE(readBoolean({"1"}) == true);
REQUIRE(readBooleanFromOpcode({"", "0"}) == false); REQUIRE(readBoolean({"0"}) == false);
REQUIRE(readBooleanFromOpcode({"", "777"}) == true); REQUIRE(readBoolean({"777"}) == true);
REQUIRE(readBooleanFromOpcode({"", "on"}) == true); REQUIRE(readBoolean({"on"}) == true);
REQUIRE(readBooleanFromOpcode({"", "off"}) == false); REQUIRE(readBoolean({"off"}) == false);
REQUIRE(readBooleanFromOpcode({"", "On"}) == true); REQUIRE(readBoolean({"On"}) == true);
REQUIRE(readBooleanFromOpcode({"", "oFf"}) == false); REQUIRE(readBoolean({"oFf"}) == false);
} }