Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mono Legato Mode #16

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Mono Legato Mode #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/sst/voicemanager/voicemanager_constraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ template <typename Cfg, typename Responder, typename MonoResponder> struct Const
void (Responder::*)(std::function<void(typename Cfg::voice_t *)>))
HASMEM(retriggerVoiceWithNewNoteID, Responder,
void (Responder::*)(typename Cfg::voice_t *, int32_t, float))
HASMEM(moveVoice, Responder,
void (Responder::*)(typename Cfg::voice_t *, uint16_t, uint16_t, uint16_t, float))
HASMEM(moveAndRetriggerVoice, Responder,
void (Responder::*)(typename Cfg::voice_t *, uint16_t, uint16_t, uint16_t, float))

HASMEM(beginVoiceCreationTransaction, Responder,
int32_t (Responder::*)(typename VoiceBeginBufferEntry<Cfg>::buffer_t &, uint16_t,
Expand Down
107 changes: 99 additions & 8 deletions include/sst/voicemanager/voicemanager_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ struct VoiceManager<Cfg, Responder, MonoResponder>::Details
int16_t port{0}, channel{0}, key{0};
int32_t noteId{-1};

int16_t originalPort{0}, originalChannel{0}, originalKey{0};

int64_t voiceCounter{0}, transactionId{0};

bool gated{false};
Expand All @@ -73,6 +75,13 @@ struct VoiceManager<Cfg, Responder, MonoResponder>::Details
res = res && (nid == -1 || noteId == -1 || nid == noteId);
return res;
}

void snapOriginalToCurrent()
{
originalPort = port;
originalChannel = channel;
originalKey = key;
}
};
std::array<VoiceInfo, Cfg::maxVoiceCount> voiceInfo;
std::unordered_map<uint64_t, int32_t> polyLimits;
Expand Down Expand Up @@ -278,15 +287,14 @@ struct VoiceManager<Cfg, Responder, MonoResponder>::Details

void doMonoRetrigger(int16_t port, uint64_t polyGroup)
{
VML("=== MONO mode voice retrigger for " << polyGroup);
VML("=== MONO mode voice retrigger or move for " << polyGroup);
auto &ks = keyStateByPort[port];
auto ft = playModeFeatures.at(polyGroup);
int dch{-1}, dk{-1};
float dvel{0.f};

auto findBestKey = [&](bool ignoreSustain)
{
VML("- find best key " << ignoreSustain);
if (ft & (uint64_t)MonoPlayModeFeatures::ON_RELEASE_TO_LATEST)
{
int64_t mtx = 0;
Expand Down Expand Up @@ -368,7 +376,7 @@ struct VoiceManager<Cfg, Responder, MonoResponder>::Details
if (dch < 0)
findBestKey(true);

if (dch >= 0 && dk >= 0)
if (ft & (uint64_t)MonoPlayModeFeatures::MONO_RETRIGGER && dch >= 0 && dk >= 0)
{
// Need to know the velocity and the port
VML("- retrigger Note " << dch << " " << dk << " " << dvel);
Expand Down Expand Up @@ -406,6 +414,7 @@ struct VoiceManager<Cfg, Responder, MonoResponder>::Details
vi.channel = dch;
vi.key = dk;
vi.noteId = dnid;
vi.snapOriginalToCurrent();

vi.gated = true;
vi.gatedDueToSustain = false;
Expand Down Expand Up @@ -435,6 +444,31 @@ struct VoiceManager<Cfg, Responder, MonoResponder>::Details

vm.responder.endVoiceCreationTransaction(port, dch, dk, dnid, dvel);
}

else if (ft & (uint64_t)MonoPlayModeFeatures::MONO_LEGATO && dch >= 0 && dk >= 0)
{
VML("- Move notes in group " << polyGroup << " to " << dch << "/" << dk);
for (auto &v : voiceInfo)
{
if (v.activeVoiceCookie && v.polyGroup == polyGroup)
{
if (v.gated || v.gatedDueToSustain)
{
VML("- Move gated voice");
vm.responder.moveVoice(v.activeVoiceCookie, port, dch, dk, dvel);
}
else
{
VML("- Move and retrigger non gated voice");
vm.responder.moveAndRetriggerVoice(v.activeVoiceCookie, port, dch, dk,
dvel);
}
v.port = port;
v.channel = dch;
v.key = dk;
}
}
}
}

bool anyKeyHeldFor(int16_t port, uint64_t polyGroup, int exceptChannel, int exceptKey,
Expand Down Expand Up @@ -625,13 +659,57 @@ bool VoiceManager<Cfg, Responder, MonoResponder>::processNoteOnEvent(int16_t por
VML("Mono Stealing:");
for (const auto &mpg : monoGroups)
{
VML("- Would steal all voices in " << mpg << " (TODO: This is *WRONG* for Legato)");
for (const auto &v : details.voiceInfo)
VML("- Would steal all voices in " << mpg);
auto isLegato =
details.playModeFeatures.at(mpg) & (uint64_t)MonoPlayModeFeatures::MONO_LEGATO;
VML("- IsLegato : " << isLegato);
if (isLegato)
{
bool foundOne{false};
for (auto &v : details.voiceInfo)
{
if (v.activeVoiceCookie && v.polyGroup == mpg)
{
VML(" - Moving existing voice " << v.activeVoiceCookie << " to " << key);
if (v.gated)
{
responder.moveVoice(v.activeVoiceCookie, port, channel, key, velocity);
}
else
{
responder.moveAndRetriggerVoice(v.activeVoiceCookie, port, channel, key,
velocity);
}
v.port = port;
v.channel = channel;
v.key = key;
v.gated = true;

foundOne = true;
}
}
if (foundOne)
{
for (int i = 0; i < voicesToBeLaunched; ++i)
{
if (details.voiceBeginWorkingBuffer[i].polyphonyGroup == mpg)
{
VML(" - Setting instruction " << i << " to skip");
details.voiceInitInstructionsBuffer[i].instruction =
VoiceInitInstructionsEntry<Cfg>::Instruction::SKIP;
}
}
}
}
else
{
if (v.activeVoiceCookie && v.polyGroup == mpg)
for (const auto &v : details.voiceInfo)
{
VML("- Stealing voice " << v.key);
responder.terminateVoice(v.activeVoiceCookie);
if (v.activeVoiceCookie && v.polyGroup == mpg)
{
VML("- Stealing voice " << v.key);
responder.terminateVoice(v.activeVoiceCookie);
}
}
}
}
Expand Down Expand Up @@ -682,6 +760,7 @@ bool VoiceManager<Cfg, Responder, MonoResponder>::processNoteOnEvent(int16_t por
vi.channel = channel;
vi.key = key;
vi.noteId = noteid;
vi.snapOriginalToCurrent();

vi.gated = true;
vi.gatedDueToSustain = false;
Expand Down Expand Up @@ -732,6 +811,17 @@ void VoiceManager<Cfg, Responder, MonoResponder>::processNoteOffEvent(int16_t po
VML("- Found matching release note at " << vi.polyGroup << " " << vi.key);
if (details.playMode[vi.polyGroup] == PlayMode::MONO_NOTES)
{
if (details.playModeFeatures[vi.polyGroup] &
(uint64_t)MonoPlayModeFeatures::MONO_LEGATO)
{
bool anyOtherOption = details.anyKeyHeldFor(port, vi.polyGroup, channel, key);
if (anyOtherOption)
{
retriggerGroups.insert(vi.polyGroup);
VML("- A key is down in same group. Initiating mono legato move");
continue;
}
}
if (details.sustainOn)
{
VML("- Release with sustain on. Checking to see if there are gated voices "
Expand Down Expand Up @@ -776,6 +866,7 @@ void VoiceManager<Cfg, Responder, MonoResponder>::processNoteOffEvent(int16_t po
}
else
{
// Poly branch ere
if (details.sustainOn)
{
vi.gatedDueToSustain = true;
Expand Down
Loading
Loading