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

CC number oopsie

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-07-27 16:23:28 +02:00
parent 675d7f3fc5
commit 0ebe24939d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/modulations/ModKey.cpp
View file

@ -12,7 +12,7 @@
namespace sfz { namespace sfz {
ModKey ModKey::createCC(uint8_t cc, uint8_t curve, uint8_t smooth, float value, float step) ModKey ModKey::createCC(uint16_t cc, uint8_t curve, uint8_t smooth, float value, float step)
{ {
ModKey::Parameters p; ModKey::Parameters p;
p.cc = cc; p.cc = cc;

4
src/sfizz/modulations/ModKey.h
View file

@ -27,7 +27,7 @@ public:
explicit ModKey(ModId id, NumericId<Region> region = {}, Parameters params = {}) explicit ModKey(ModId id, NumericId<Region> region = {}, Parameters params = {})
: id_(id), region_(region), params_(params) {} : id_(id), region_(region), params_(params) {}
static ModKey createCC(uint8_t cc, uint8_t curve, uint8_t smooth, float value, float step); static ModKey createCC(uint16_t cc, uint8_t curve, uint8_t smooth, float value, float step);
static ModKey createNXYZ(ModId id, NumericId<Region> region, uint8_t N = 0, uint8_t X = 0, uint8_t Y = 0, uint8_t Z = 0); static ModKey createNXYZ(ModId id, NumericId<Region> region, uint8_t N = 0, uint8_t X = 0, uint8_t Y = 0, uint8_t Z = 0);
explicit operator bool() const noexcept { return id_ != ModId(); } explicit operator bool() const noexcept { return id_ != ModId(); }
@ -45,7 +45,7 @@ public:
Parameters() { std::memset(this, 0, sizeof(*this)); } Parameters() { std::memset(this, 0, sizeof(*this)); }
union { union {
//! Parameters if this key identifies a CC source //! Parameters if this key identifies a CC source
struct { uint8_t cc, curve, smooth; float value, step; }; struct { uint16_t cc; uint8_t curve, smooth; float value, step; };
//! Parameters otherwise, based on the related opcode //! Parameters otherwise, based on the related opcode
// eg. `N` in `lfoN`, `N, X` in `lfoN_eqX` // eg. `N` in `lfoN`, `N, X` in `lfoN_eqX`
struct { uint8_t N, X, Y, Z; }; struct { uint8_t N, X, Y, Z; };