diff --git a/codegen/generate.ts b/codegen/generate.ts index 66cf019..ab96afe 100644 --- a/codegen/generate.ts +++ b/codegen/generate.ts @@ -128,15 +128,16 @@ function cppFloatLit(n: number): string { } function cppCurveEnum(c: Curve): string { - // Map snake-case curve names to PascalCase enum values + // Curve enum lives in nisps/core/math.hpp (namespace `nisps`), lowercase per architecture spec. + // Re-exported as `nisps::modes::generated::Curve` via `using Curve = ::nisps::Curve;`. switch (c) { - case "linear": return "Curve::Linear"; - case "exp": return "Curve::Exp"; - case "log": return "Curve::Log"; - case "square": return "Curve::Square"; - case "sqrt": return "Curve::Sqrt"; - case "sigmoid":return "Curve::Sigmoid"; - case "cubic": return "Curve::Cubic"; + case "linear": return "Curve::linear"; + case "exp": return "Curve::exp"; + case "log": return "Curve::log"; + case "square": return "Curve::square"; + case "sqrt": return "Curve::sqrt"; + case "sigmoid":return "Curve::sigmoid"; + case "cubic": return "Curve::cubic"; } } @@ -155,11 +156,8 @@ function emitSchemaTypesHpp(): string { "// AUTOGENERATED — do not edit. Run `bun run codegen/generate.ts` to regenerate.", "// Shared C++ types for generated mode schemas.", "//", - "// IMPORTANT: this file ships its own minimal `Curve` enum so generated mode", - "// headers compile in isolation while stream 1 (`nisps/core/math.hpp`) is in", - "// flight. Once stream 1 lands, replace the local enum below with", - "// #include \"nisps/core/math.hpp\"", - "// and delete the inline definition.", + "// `Curve` is the authoritative enum from nisps/core/math.hpp; we re-export it", + "// into this namespace so generated headers can refer to plain `Curve::linear`.", "#ifndef NISPS_GENERATED_SCHEMA_TYPES_HPP", "#define NISPS_GENERATED_SCHEMA_TYPES_HPP", "", @@ -167,18 +165,11 @@ function emitSchemaTypesHpp(): string { "#include ", "#include ", "", + "#include \"../../core/math.hpp\"", + "", "namespace nisps::modes::generated {", "", - "// TODO(stream-1): replace with `#include \"nisps/core/math.hpp\"` and remove this enum.", - "enum class Curve : unsigned char {", - " Linear = 0,", - " Exp,", - " Log,", - " Square,", - " Sqrt,", - " Sigmoid,", - " Cubic,", - "};", + "using Curve = ::nisps::Curve;", "", "struct Param {", " std::string_view name;", diff --git a/codegen/tests/golden/paf_synth_schema.hpp b/codegen/tests/golden/paf_synth_schema.hpp index 887355e..fc5adfa 100644 --- a/codegen/tests/golden/paf_synth_schema.hpp +++ b/codegen/tests/golden/paf_synth_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "delay", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delay", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "envelope", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -254,7 +254,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -263,7 +263,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -272,7 +272,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "shaper", }, Param{ @@ -281,7 +281,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "shaper", }, Param{ @@ -290,7 +290,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "shaper", }, Param{ @@ -299,7 +299,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "shaper", }, Param{ @@ -308,7 +308,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "envelope", }, Param{ @@ -317,7 +317,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "envelope", }, Param{ @@ -326,7 +326,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Linear, + Curve::linear, "envelope", }, }}; diff --git a/nisps/modes/generated/breakor_schema.hpp b/nisps/modes/generated/breakor_schema.hpp index 1b21591..9ee607e 100644 --- a/nisps/modes/generated/breakor_schema.hpp +++ b/nisps/modes/generated/breakor_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "kick", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "snare", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "tom", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -254,7 +254,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -263,7 +263,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -272,7 +272,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -281,7 +281,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "lowtom", }, Param{ @@ -290,7 +290,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -299,7 +299,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -308,7 +308,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -317,7 +317,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -326,7 +326,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -335,7 +335,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -344,7 +344,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "rim", }, Param{ @@ -353,7 +353,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -362,7 +362,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -371,7 +371,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -380,7 +380,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -389,7 +389,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -398,7 +398,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -407,7 +407,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "hat", }, Param{ @@ -416,7 +416,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -425,7 +425,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -434,7 +434,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -443,7 +443,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -452,7 +452,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -461,7 +461,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -470,7 +470,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "openhat", }, Param{ @@ -479,7 +479,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "perc", }, Param{ @@ -488,7 +488,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "perc", }, Param{ @@ -497,7 +497,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "perc", }, Param{ @@ -506,7 +506,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "perc", }, Param{ @@ -515,7 +515,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "perc", }, Param{ @@ -524,7 +524,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "perc", }, Param{ @@ -533,7 +533,7 @@ inline constexpr std::array kBreakorParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "perc", }, }}; diff --git a/nisps/modes/generated/channel_strip_schema.hpp b/nisps/modes/generated/channel_strip_schema.hpp index 3995dd9..0e83d35 100644 --- a/nisps/modes/generated/channel_strip_schema.hpp +++ b/nisps/modes/generated/channel_strip_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "gain", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "eq", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "eq", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Linear, + Curve::linear, "eq", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "eq", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.7f, - Curve::Square, + Curve::square, "filters", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.2f, - Curve::Square, + Curve::square, "filters", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "comp", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "comp", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.1f, - Curve::Linear, + Curve::linear, "comp", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "comp", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "eq", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Linear, + Curve::linear, "eq", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "eq", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "eq", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.3f, - Curve::Linear, + Curve::linear, "eq", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "eq", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kChannelStripParams 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "gain", }, }}; diff --git a/nisps/modes/generated/elysiamorf_schema.hpp b/nisps/modes/generated/elysiamorf_schema.hpp index 04151d6..299c315 100644 --- a/nisps/modes/generated/elysiamorf_schema.hpp +++ b/nisps/modes/generated/elysiamorf_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm0", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm0", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm0", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm0", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm0", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm1", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm1", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm1", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm1", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm1", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm2", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm2", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm2", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm2", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm2", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm3", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm3", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm3", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm3", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm3", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm4", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm4", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm4", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm4", }, Param{ @@ -254,7 +254,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm4", }, Param{ @@ -263,7 +263,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm5", }, Param{ @@ -272,7 +272,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm5", }, Param{ @@ -281,7 +281,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm5", }, Param{ @@ -290,7 +290,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm5", }, Param{ @@ -299,7 +299,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm5", }, Param{ @@ -308,7 +308,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm6", }, Param{ @@ -317,7 +317,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm6", }, Param{ @@ -326,7 +326,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm6", }, Param{ @@ -335,7 +335,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm6", }, Param{ @@ -344,7 +344,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm6", }, Param{ @@ -353,7 +353,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm7", }, Param{ @@ -362,7 +362,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "fm7", }, Param{ @@ -371,7 +371,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm7", }, Param{ @@ -380,7 +380,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm7", }, Param{ @@ -389,7 +389,7 @@ inline constexpr std::array kElysiamorfParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "fm7", }, }}; diff --git a/nisps/modes/generated/memlcelium_schema.hpp b/nisps/modes/generated/memlcelium_schema.hpp index b361ca6..a297f43 100644 --- a/nisps/modes/generated/memlcelium_schema.hpp +++ b/nisps/modes/generated/memlcelium_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "sequencer", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "v0_synth", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "v0_synth", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -254,7 +254,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -263,7 +263,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -272,7 +272,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_env", }, Param{ @@ -281,7 +281,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "v0_env", }, Param{ @@ -290,7 +290,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v0_env", }, Param{ @@ -299,7 +299,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "v0_env", }, Param{ @@ -308,7 +308,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_env", }, Param{ @@ -317,7 +317,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "v0_env", }, Param{ @@ -326,7 +326,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_env", }, Param{ @@ -335,7 +335,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -344,7 +344,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -353,7 +353,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -362,7 +362,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v0_synth", }, Param{ @@ -371,7 +371,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -380,7 +380,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -389,7 +389,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -398,7 +398,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -407,7 +407,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -416,7 +416,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -425,7 +425,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -434,7 +434,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -443,7 +443,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -452,7 +452,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -461,7 +461,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -470,7 +470,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_synth", }, Param{ @@ -479,7 +479,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v1_env", }, Param{ @@ -488,7 +488,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "v1_env", }, Param{ @@ -497,7 +497,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "v1_env", }, Param{ @@ -506,7 +506,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "v1_env", }, Param{ @@ -515,7 +515,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v1_env", }, Param{ @@ -524,7 +524,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "v1_env", }, Param{ @@ -533,7 +533,7 @@ inline constexpr std::array kMemlceliumParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "v1_env", }, }}; diff --git a/nisps/modes/generated/paf_synth_schema.hpp b/nisps/modes/generated/paf_synth_schema.hpp index 887355e..fc5adfa 100644 --- a/nisps/modes/generated/paf_synth_schema.hpp +++ b/nisps/modes/generated/paf_synth_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Square, + Curve::square, "modulation", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "operators", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "delay", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delay", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Square, + Curve::square, "envelope", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -254,7 +254,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -263,7 +263,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -272,7 +272,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "shaper", }, Param{ @@ -281,7 +281,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "shaper", }, Param{ @@ -290,7 +290,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "shaper", }, Param{ @@ -299,7 +299,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "shaper", }, Param{ @@ -308,7 +308,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "envelope", }, Param{ @@ -317,7 +317,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "envelope", }, Param{ @@ -326,7 +326,7 @@ inline constexpr std::array kPafSynthParams = {{ 0.0f, 1.0f, 0.3f, - Curve::Linear, + Curve::linear, "envelope", }, }}; diff --git a/nisps/modes/generated/schema_types.hpp b/nisps/modes/generated/schema_types.hpp index 76add88..c40abef 100644 --- a/nisps/modes/generated/schema_types.hpp +++ b/nisps/modes/generated/schema_types.hpp @@ -1,11 +1,8 @@ // AUTOGENERATED — do not edit. Run `bun run codegen/generate.ts` to regenerate. // Shared C++ types for generated mode schemas. // -// IMPORTANT: this file ships its own minimal `Curve` enum so generated mode -// headers compile in isolation while stream 1 (`nisps/core/math.hpp`) is in -// flight. Once stream 1 lands, replace the local enum below with -// #include "nisps/core/math.hpp" -// and delete the inline definition. +// `Curve` is the authoritative enum from nisps/core/math.hpp; we re-export it +// into this namespace so generated headers can refer to plain `Curve::linear`. #ifndef NISPS_GENERATED_SCHEMA_TYPES_HPP #define NISPS_GENERATED_SCHEMA_TYPES_HPP @@ -13,18 +10,11 @@ #include #include +#include "../../core/math.hpp" + namespace nisps::modes::generated { -// TODO(stream-1): replace with `#include "nisps/core/math.hpp"` and remove this enum. -enum class Curve : unsigned char { - Linear = 0, - Exp, - Log, - Square, - Sqrt, - Sigmoid, - Cubic, -}; +using Curve = ::nisps::Curve; struct Param { std::string_view name; diff --git a/nisps/modes/generated/sound_analysis_midi_schema.hpp b/nisps/modes/generated/sound_analysis_midi_schema.hpp index 03497fa..cde3b3e 100644 --- a/nisps/modes/generated/sound_analysis_midi_schema.hpp +++ b/nisps/modes/generated/sound_analysis_midi_schema.hpp @@ -44,7 +44,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -53,7 +53,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -62,7 +62,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -71,7 +71,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -80,7 +80,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -89,7 +89,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -98,7 +98,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, Param{ @@ -107,7 +107,7 @@ inline constexpr std::array kSoundAnalysisM 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "midi", }, }}; diff --git a/nisps/modes/generated/verb_fx_schema.hpp b/nisps/modes/generated/verb_fx_schema.hpp index 3196753..d18b127 100644 --- a/nisps/modes/generated/verb_fx_schema.hpp +++ b/nisps/modes/generated/verb_fx_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "routing", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -254,7 +254,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -263,7 +263,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -272,7 +272,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -281,7 +281,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -290,7 +290,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -299,7 +299,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -308,7 +308,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -317,7 +317,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -326,7 +326,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -335,7 +335,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -344,7 +344,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -353,7 +353,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -362,7 +362,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "filterbank", }, Param{ @@ -371,7 +371,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -380,7 +380,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -389,7 +389,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -398,7 +398,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -407,7 +407,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -416,7 +416,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -425,7 +425,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "routing", }, Param{ @@ -434,7 +434,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "routing", }, Param{ @@ -443,7 +443,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -452,7 +452,7 @@ inline constexpr std::array kVerbFxParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, }}; diff --git a/nisps/modes/generated/xiasri_schema.hpp b/nisps/modes/generated/xiasri_schema.hpp index bda7045..7e6f501 100644 --- a/nisps/modes/generated/xiasri_schema.hpp +++ b/nisps/modes/generated/xiasri_schema.hpp @@ -38,7 +38,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -47,7 +47,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -56,7 +56,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -65,7 +65,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "general", }, Param{ @@ -74,7 +74,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -83,7 +83,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -92,7 +92,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -101,7 +101,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -110,7 +110,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -119,7 +119,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -128,7 +128,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, Param{ @@ -137,7 +137,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "mix", }, Param{ @@ -146,7 +146,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.5f, - Curve::Linear, + Curve::linear, "pitch", }, Param{ @@ -155,7 +155,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "pitch", }, Param{ @@ -164,7 +164,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -173,7 +173,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -182,7 +182,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -191,7 +191,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -200,7 +200,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -209,7 +209,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -218,7 +218,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -227,7 +227,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "verb", }, Param{ @@ -236,7 +236,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Square, + Curve::square, "delays", }, Param{ @@ -245,7 +245,7 @@ inline constexpr std::array kXiasriParams = {{ 0.0f, 1.0f, 0.0f, - Curve::Linear, + Curve::linear, "delays", }, }};