Skip to content

Commit

Permalink
Support MIDI channels with MTS when not using ch2+3 to play scenes
Browse files Browse the repository at this point in the history 
Closes surge-synthesizer#7202
  • Loading branch information
@mkruselj
mkruselj committed Oct 23, 2023
1 parent 6920190 commit d5b60dd
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 35 deletions.
2 changes: 1 addition & 1 deletion libs/sst/sst-plugininfra
Submodule sst-plugininfra updated 2 files
+17 −6 include/sst/plugininfra/userdefaults.h
+1 −1 libs/tinyxml/CMakeLists.txt
14 changes: 8 additions & 6 deletions src/common/UserDefaults.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,20 +368,22 @@ std::string defaultKeyToString(DefaultKey k)
*/

std::string getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key,
const std::string &valueIfMissing)
const std::string &valueIfMissing, bool potentiallyRead)
{
return storage->userDefaultsProvider->getUserDefaultValue(key, valueIfMissing);
return storage->userDefaultsProvider->getUserDefaultValue(key, valueIfMissing, potentiallyRead);
}

int getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key, int valueIfMissing)
int getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key, int valueIfMissing,
bool potentiallyRead)
{
return storage->userDefaultsProvider->getUserDefaultValue(key, valueIfMissing);
return storage->userDefaultsProvider->getUserDefaultValue(key, valueIfMissing, potentiallyRead);
}

std::pair<int, int> getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key,
const std::pair<int, int> &valueIfMissing)
const std::pair<int, int> &valueIfMissing,
bool potentiallyRead)
{
return storage->userDefaultsProvider->getUserDefaultValue(key, valueIfMissing);
return storage->userDefaultsProvider->getUserDefaultValue(key, valueIfMissing, potentiallyRead);
}

bool updateUserDefaultValue(SurgeStorage *storage, const DefaultKey &key, const std::string &value)
Expand Down
8 changes: 5 additions & 3 deletions src/common/UserDefaults.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,12 @@ typedef sst::plugininfra::defaults::Provider<DefaultKey, DefaultKey::nKeys> User
* on this for both std::string and int stored values.
*/
std::string getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key,
const std::string &valueIfMissing);
int getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key, int valueIfMissing);
const std::string &valueIfMissing, bool potentiallyRead = true);
int getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key, int valueIfMissing,
bool potentiallyRead = true);
std::pair<int, int> getUserDefaultValue(SurgeStorage *storage, const DefaultKey &key,
const std::pair<int, int> &valueIfMissing);
const std::pair<int, int> &valueIfMissing,
bool potentiallyRead = true);
inline fs::path getUserDefaultPath(SurgeStorage *storage, const DefaultKey &key,
const fs::path &valueIfMissing)
{
Expand Down
50 changes: 25 additions & 25 deletions src/common/dsp/SurgeVoice.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/

#include "SurgeVoice.h"
#include "UserDefaults.h"
#include "DSPUtils.h"
#include "QuadFilterChain.h"
#include "globals.h"
Expand Down Expand Up @@ -72,7 +73,8 @@ float SurgeVoiceState::getPitch(SurgeStorage *storage)
key != keyRetuningForKey)
{
keyRetuningForKey = key;
keyRetuning = MTS_RetuningInSemitones(storage->oddsound_mts_client, key + mpeBend, 0);
keyRetuning = MTS_RetuningInSemitones(storage->oddsound_mts_client, key + mpeBend,
mtsUseChannelWhenRetuning ? 0 : channel);
}
auto rkey = keyRetuning;

Expand Down Expand Up @@ -154,11 +156,10 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *
assert(oscene);

sampleRateReset();

memcpy(localcopy, paramptr, sizeof(localcopy));

noteExpressions[VOLUME] = 1.0; // 1 is no ampplification
noteExpressions[PAN] = 0.5; // since it is 0..1
noteExpressions[VOLUME] = 1.0; // 1 is no amplification
noteExpressions[PAN] = 0.5; // since it is 0 ... 1
noteExpressions[PITCH] = 0.0;
noteExpressions[TIMBRE] = 0.0;
noteExpressions[PRESSURE] = 0.0;
Expand All @@ -168,6 +169,7 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *

age = 0;
age_release = 0;

state.key = key;
state.keyRetuningForKey = -1000;
state.channel = channel;
Expand All @@ -192,6 +194,14 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *
state.mpePitchBend.set_samplerate(storage->samplerate, storage->samplerate_inv);
state.mpePitchBend.init(voiceChannelState->pitchBend / 8192.f);

#ifndef SURGE_SKIP_ODDSOUND_MTS
const bool isCh23Mode = Surge::Storage::getUserDefaultValue(
storage, Surge::Storage::UseCh2Ch3ToPlayScenesIndividually, true, false);
const bool isChSplitMode = storage->getPatch().scenemode.val.i == sm_chsplit;

state.mtsUseChannelWhenRetuning = (mpeEnabled || isChSplitMode || isCh23Mode);
#endif

resetPortamentoFrom(storage->last_key[scene_id], channel);

storage->last_key[scene_id] = key;
Expand All @@ -209,6 +219,7 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *
{
osctype[i] = -1;
}

memset(&FBP, 0, sizeof(FBP));
sampleRateReset();

Expand Down Expand Up @@ -262,8 +273,8 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *
modsources[ms_keytrack] = &keytrackSource;
modsources[ms_polyaftertouch] = &polyAftertouchSource;

// Velocity is *almost* never reset except in poly mode so init it here
// then make it adapt smoothly.
// Velocity is *almost* never reset except in poly mode,
// so init it here then make it adapt smoothly.
velocitySource.init(0, state.fvel);
velocitySource.smoothingMode = Modulator::SmoothingMode::SLOW_EXP;
velocitySource.set_samplerate(storage->samplerate, storage->samplerate_inv);
Expand All @@ -272,9 +283,9 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *

ampEGSource.init(storage, &scene->adsr[0], localcopy, &state);
filterEGSource.init(storage, &scene->adsr[1], localcopy, &state);

modsources[ms_ampeg] = &ampEGSource;
modsources[ms_filtereg] = &filterEGSource;

modsources[ms_modwheel] = oscene->modsources[ms_modwheel];
modsources[ms_breath] = oscene->modsources[ms_breath];
modsources[ms_expression] = oscene->modsources[ms_expression];
Expand All @@ -285,15 +296,18 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *
modsources[ms_latest_key] = oscene->modsources[ms_latest_key];
modsources[ms_timbre] = &timbreSource;
modsources[ms_pitchbend] = oscene->modsources[ms_pitchbend];
for (int i = 0; i < n_customcontrollers; i++)
modsources[ms_ctrl1 + i] = oscene->modsources[ms_ctrl1 + i];
modsources[ms_slfo1] = oscene->modsources[ms_slfo1];
modsources[ms_slfo2] = oscene->modsources[ms_slfo2];
modsources[ms_slfo3] = oscene->modsources[ms_slfo3];
modsources[ms_slfo4] = oscene->modsources[ms_slfo4];
modsources[ms_slfo5] = oscene->modsources[ms_slfo5];
modsources[ms_slfo6] = oscene->modsources[ms_slfo6];

for (int i = 0; i < n_customcontrollers; i++)
{
modsources[ms_ctrl1 + i] = oscene->modsources[ms_ctrl1 + i];
}

/*
** We want to snap the rnd and alt
*/
Expand Down Expand Up @@ -340,26 +354,12 @@ SurgeVoice::SurgeVoice(SurgeStorage *storage, SurgeSceneStorage *oscene, pdata *
}

calc_ctrldata<true>(0, 0); // init interpolators
SetQFB(0, 0); // init Quad-Filterblock parameter interpolators
SetQFB(0, 0); // init Quad Filter Block parameter interpolators

// It is imposrtant that switch_toggled comes last since it creates and activates the
// It is important that switch_toggled comes last since it creates and activates the
// oscillators which need the modulation state set in calc_ctrldata to get sample 0
// right.
switch_toggled();

// for (int i = 0; i < 128; i++)
//{
// printf("%.7f %.7f %.7f %.7f\n", table_envrate_exp[(i * 4) + 0], table_envrate_exp[(i * 4) +
// 1],
// table_envrate_exp[(i * 4) + 2], table_envrate_exp[(i * 4) + 3]);
//}
// printf("\n");
// for (int i = 0; i < 128; i++)
//{
// printf("%.7f %.7f %.7f %.7f\n", table_envrate_linear[(i * 4) + 0],
// table_envrate_linear[(i * 4) + 1], table_envrate_linear[(i * 4) + 2],
// table_envrate_linear[(i * 4) + 3]);
//}
}

SurgeVoice::~SurgeVoice() {}
Expand Down
1 change: 1 addition & 0 deletions src/common/dsp/SurgeVoiceState.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ struct SurgeVoiceState
ControllerModulationSource mpePitchBend;
float mpePitchBendRange;
bool mpeEnabled;
bool mtsUseChannelWhenRetuning = false;
int64_t voiceOrderAtCreate{-1};

float getPitch(SurgeStorage *storage);
Expand Down

0 comments on commit d5b60dd

Please sign in to comment.