thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- More cleanup.

Browse source 
- Note-on MIDI commands outside the range 12-108 are now raised/lowered by octaves until in range (instead of being ignored).

svn-id: r15802
This commit is contained in:
Jerome Fisher 2004-11-14 04:40:12 +00:00
parent 1aeca6838b
commit a158e884a0
6 changed files with 93 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

146
backends/midi/mt32/part.cpp
View file

@ -215,7 +215,7 @@ unsigned int Part::getAbsTimbreNum() {
void Part::setPatch(int patchNum) { void Part::setPatch(int patchNum) {
int absTimbreNum = -1; // Initialised to please compiler int absTimbreNum = -1; // Initialised to please compiler
TimbreParam timSrc; const TimbreParam *timbre;
if (isRhythm) { if (isRhythm) {
// "patchNum" is treated as "timbreNum" for rhythm part // "patchNum" is treated as "timbreNum" for rhythm part
if (patchNum < 128) { if (patchNum < 128) {
@ -223,7 +223,7 @@ void Part::setPatch(int patchNum) {
return; return;
} }
absTimbreNum = patchNum; absTimbreNum = patchNum;
timSrc = synth->mt32ram.params.timbres[absTimbreNum].timbre; timbre = &synth->mt32ram.params.timbres[absTimbreNum].timbre;
} else { } else {
if (patchNum >= 0) { if (patchNum >= 0) {
setPatch(&synth->mt32ram.params.patches[patchNum]); setPatch(&synth->mt32ram.params.patches[patchNum]);
@ -231,21 +231,21 @@ void Part::setPatch(int patchNum) {
if (patchNum >= 0) { if (patchNum >= 0) {
setTimbre(&synth->mt32ram.params.timbres[getAbsTimbreNum()].timbre); setTimbre(&synth->mt32ram.params.timbres[getAbsTimbreNum()].timbre);
} }
timSrc = *timbreTemp; timbre = timbreTemp;
#if 0 #if 0
// Immediately stop all partials on this part (this is apparently *not* the correct behaviour) // Immediately stop all partials on this part (this is apparently *not* the correct behaviour)
for (int m = 0; m < MT32EMU_MAX_POLY; m++) { for (int m = 0; m < MT32EMU_MAX_POLY; m++) {
AbortPoly(poly); AbortPoly(poly);
} }
#else #else
// check if any partials are still playing on this part // check if any partials are still playing with the old patch cache
// if so then duplicate the cached data from the part to the partial so that // if so then duplicate the cached data from the part to the partial so that
// we can change the part's cache without affecting the partial. // we can change the part's cache without affecting the partial.
// Hopefully this is fairly rare. // We delay this until now to avoid a copy operation with every note played
for (int m = 0; m < MT32EMU_MAX_POLY; m++) { for (int m = 0; m < MT32EMU_MAX_POLY; m++) {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
Partial *partial = polyTable[m].partials[i]; Partial *partial = polyTable[m].partials[i];
if (partial != NULL) { if (partial != NULL && partial->patchCache == &patchCache[i]) {
// copy cache data // copy cache data
partial->cachebackup = patchCache[i]; partial->cachebackup = patchCache[i];
// update pointers // update pointers
@ -256,11 +256,11 @@ void Part::setPatch(int patchNum) {
#endif #endif
} }
memcpy(currentInstr, timSrc.common.name, 10); memcpy(currentInstr, timbre->common.name, 10);
int partialCount = 0; int partialCount = 0;
for (int t=0;t<4;t++) { for (int t = 0; t < 4; t++) {
if ( ((timSrc.common.pmute >> (t)) & 0x1) == 1 ) { if (((timbre->common.pmute >> t) & 0x1) == 1) {
patchCache[t].playPartial = true; patchCache[t].playPartial = true;
partialCount++; partialCount++;
} else { } else {
@ -270,31 +270,31 @@ void Part::setPatch(int patchNum) {
// Calculate and cache common parameters // Calculate and cache common parameters
patchCache[t].pcm = timSrc.partial[t].wg.pcmwave; patchCache[t].pcm = timbre->partial[t].wg.pcmwave;
patchCache[t].useBender = (timSrc.partial[t].wg.bender == 1); patchCache[t].useBender = (timbre->partial[t].wg.bender == 1);
switch (t) { switch (t) {
case 0: case 0:
patchCache[t].PCMPartial = (PartialStruct[(int)timSrc.common.pstruct12] & 0x2) ? true : false; patchCache[t].PCMPartial = (PartialStruct[(int)timbre->common.pstruct12] & 0x2) ? true : false;
patchCache[t].structureMix = PartialMixStruct[(int)timSrc.common.pstruct12]; patchCache[t].structureMix = PartialMixStruct[(int)timbre->common.pstruct12];
patchCache[t].structurePosition = 0; patchCache[t].structurePosition = 0;
patchCache[t].structurePair = 1; patchCache[t].structurePair = 1;
break; break;
case 1: case 1:
patchCache[t].PCMPartial = (PartialStruct[(int)timSrc.common.pstruct12] & 0x1) ? true : false; patchCache[t].PCMPartial = (PartialStruct[(int)timbre->common.pstruct12] & 0x1) ? true : false;
patchCache[t].structureMix = PartialMixStruct[(int)timSrc.common.pstruct12]; patchCache[t].structureMix = PartialMixStruct[(int)timbre->common.pstruct12];
patchCache[t].structurePosition = 1; patchCache[t].structurePosition = 1;
patchCache[t].structurePair = 0; patchCache[t].structurePair = 0;
break; break;
case 2: case 2:
patchCache[t].PCMPartial = (PartialStruct[(int)timSrc.common.pstruct34] & 0x2) ? true : false; patchCache[t].PCMPartial = (PartialStruct[(int)timbre->common.pstruct34] & 0x2) ? true : false;
patchCache[t].structureMix = PartialMixStruct[(int)timSrc.common.pstruct34]; patchCache[t].structureMix = PartialMixStruct[(int)timbre->common.pstruct34];
patchCache[t].structurePosition = 0; patchCache[t].structurePosition = 0;
patchCache[t].structurePair = 3; patchCache[t].structurePair = 3;
break; break;
case 3: case 3:
patchCache[t].PCMPartial = (PartialStruct[(int)timSrc.common.pstruct34] & 0x1) ? true : false; patchCache[t].PCMPartial = (PartialStruct[(int)timbre->common.pstruct34] & 0x1) ? true : false;
patchCache[t].structureMix = PartialMixStruct[(int)timSrc.common.pstruct34]; patchCache[t].structureMix = PartialMixStruct[(int)timbre->common.pstruct34];
patchCache[t].structurePosition = 1; patchCache[t].structurePosition = 1;
patchCache[t].structurePair = 2; patchCache[t].structurePair = 2;
break; break;
@ -302,15 +302,15 @@ void Part::setPatch(int patchNum) {
break; break;
} }
patchCache[t].waveform = timSrc.partial[t].wg.waveform; patchCache[t].waveform = timbre->partial[t].wg.waveform;
patchCache[t].pulsewidth = timSrc.partial[t].wg.pulsewid; patchCache[t].pulsewidth = timbre->partial[t].wg.pulsewid;
patchCache[t].pwsens = timSrc.partial[t].wg.pwvelo; patchCache[t].pwsens = timbre->partial[t].wg.pwvelo;
patchCache[t].pitchkeyfollow = fixKeyfollow(timSrc.partial[t].wg.keyfollow, &patchCache[t].pitchkeydir); patchCache[t].pitchkeyfollow = fixKeyfollow(timbre->partial[t].wg.keyfollow, &patchCache[t].pitchkeydir);
// Calculate and cache pitch stuff // Calculate and cache pitch stuff
patchCache[t].pitchshift = timSrc.partial[t].wg.coarse; patchCache[t].pitchshift = timbre->partial[t].wg.coarse;
Bit32s pFine, fShift; Bit32s pFine, fShift;
pFine = (Bit32s)timSrc.partial[t].wg.fine; pFine = (Bit32s)timbre->partial[t].wg.fine;
if (isRhythm) { if (isRhythm) {
patchCache[t].pitchshift += 24; patchCache[t].pitchshift += 24;
fShift = pFine + 50; fShift = pFine + 50;
@ -320,16 +320,16 @@ void Part::setPatch(int patchNum) {
} }
patchCache[t].fineshift = finetable[fShift]; patchCache[t].fineshift = finetable[fShift];
patchCache[t].pitchEnv = timSrc.partial[t].env; patchCache[t].pitchEnv = timbre->partial[t].env;
patchCache[t].pitchEnv.sensitivity = (char)((float)patchCache[t].pitchEnv.sensitivity*1.27); patchCache[t].pitchEnv.sensitivity = (char)((float)patchCache[t].pitchEnv.sensitivity*1.27);
patchCache[t].pitchsustain = patchCache[t].pitchEnv.level[3]; patchCache[t].pitchsustain = patchCache[t].pitchEnv.level[3];
// Calculate and cache TVA envelope stuff // Calculate and cache TVA envelope stuff
patchCache[t].ampEnv = timSrc.partial[t].tva; patchCache[t].ampEnv = timbre->partial[t].tva;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
patchCache[t].ampEnv.envlevel[i] = (char)((float)patchCache[t].ampEnv.envlevel[i]*1.27); patchCache[t].ampEnv.envlevel[i] = (char)((float)patchCache[t].ampEnv.envlevel[i] * 1.27f);
patchCache[t].ampEnv.level = (char)((float)patchCache[t].ampEnv.level*1.27); patchCache[t].ampEnv.level = (char)((float)patchCache[t].ampEnv.level * 1.27f);
float tvelo = ((float)timSrc.partial[t].tva.velosens / 100.0f); float tvelo = ((float)timbre->partial[t].tva.velosens / 100.0f);
float velo = fabs(tvelo-0.5f) * 2.0f; float velo = fabs(tvelo-0.5f) * 2.0f;
velo *= 63.0f; velo *= 63.0f;
patchCache[t].ampEnv.velosens = (char)velo; patchCache[t].ampEnv.velosens = (char)velo;
@ -347,7 +347,7 @@ void Part::setPatch(int patchNum) {
patchCache[t].amplevel = patchCache[t].ampEnv.level; patchCache[t].amplevel = patchCache[t].ampEnv.level;
// Calculate and cache filter stuff // Calculate and cache filter stuff
patchCache[t].filtEnv = timSrc.partial[t].tvf; patchCache[t].filtEnv = timbre->partial[t].tvf;
patchCache[t].tvfdepth = patchCache[t].filtEnv.envdkf; patchCache[t].tvfdepth = patchCache[t].filtEnv.envdkf;
patchCache[t].filtkeyfollow = fixKeyfollow(patchCache[t].filtEnv.keyfollow, &patchCache[t].keydir); patchCache[t].filtkeyfollow = fixKeyfollow(patchCache[t].filtEnv.keyfollow, &patchCache[t].keydir);
patchCache[t].filtEnv.envdepth = (char)((float)patchCache[t].filtEnv.envdepth * 1.27); patchCache[t].filtEnv.envdepth = (char)((float)patchCache[t].filtEnv.envdepth * 1.27);
@ -356,15 +356,15 @@ void Part::setPatch(int patchNum) {
patchCache[t].filtsustain = patchCache[t].filtEnv.envlevel[3]; patchCache[t].filtsustain = patchCache[t].filtEnv.envlevel[3];
// Calculate and cache LFO stuff // Calculate and cache LFO stuff
patchCache[t].lfodepth = timSrc.partial[t].lfo.depth; patchCache[t].lfodepth = timbre->partial[t].lfo.depth;
patchCache[t].lfoperiod = lfotable[(int)timSrc.partial[t].lfo.rate]; patchCache[t].lfoperiod = lfotable[(int)timbre->partial[t].lfo.rate];
patchCache[t].lforate = timSrc.partial[t].lfo.rate; patchCache[t].lforate = timbre->partial[t].lfo.rate;
patchCache[t].modsense = timSrc.partial[t].lfo.modsense; patchCache[t].modsense = timbre->partial[t].lfo.modsense;
} }
for (int t = 0; t < 4; t++) { for (int t = 0; t < 4; t++) {
// Common parameters, stored redundantly // Common parameters, stored redundantly
patchCache[t].partialCount = partialCount; patchCache[t].partialCount = partialCount;
patchCache[t].sustain = (timSrc.common.nosustain == 0); patchCache[t].sustain = (timbre->common.nosustain == 0);
if (isRhythm) { if (isRhythm) {
patchCache[t].benderRange = 0; patchCache[t].benderRange = 0;
} else { } else {
@ -380,7 +380,7 @@ void Part::setPatch(int patchNum) {
#if MT32EMU_MONITOR_INSTRUMENTS == 1 #if MT32EMU_MONITOR_INSTRUMENTS == 1
synth->printDebug("%s: Recache, param %d (timbre: %s)", name, patchNum, currentInstr); synth->printDebug("%s: Recache, param %d (timbre: %s)", name, patchNum, currentInstr);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
synth->printDebug(" %d: play=%s, pcm=%s (%d), wave=%d", i, patchCache[i].playPartial ? "YES" : "NO", patchCache[i].PCMPartial ? "YES" : "NO", timSrc.partial[i].wg.pcmwave, timSrc.partial[i].wg.waveform); synth->printDebug(" %d: play=%s, pcm=%s (%d), wave=%d", i, patchCache[i].playPartial ? "YES" : "NO", patchCache[i].PCMPartial ? "YES" : "NO", timbre->partial[i].wg.pcmwave, timbre->partial[i].wg.waveform);
} }
#endif #endif
} }
@ -395,55 +395,60 @@ void Part::setVolume(int vol) {
void Part::setPan(int pan) { void Part::setPan(int pan) {
// FIXME:KG: This is unchangeable for drums (they always use drumPan), is that correct? // FIXME:KG: This is unchangeable for drums (they always use drumPan), is that correct?
// FIXME:KG: There is no way to get a centred balance here... And the middle two // FIXME:KG: Tweaked this a bit so that we have a left 100%, centre and right 100%
// pan settings have a distance of 1024, double the usual. // (But this makes the range somewhat skewed)
// Perhaps we should multiply by 516? 520? 520.111..?
// KG: Changed to 516, to mostly eliminate that jump in the middle
if (pan < 64) { if (pan < 64) {
volumesetting.leftvol = 32767; volumesetting.leftvol = 32767;
volumesetting.rightvol = (Bit16s)(pan * 516); volumesetting.rightvol = (Bit16s)(pan * 512);
} else if (pan == 64) {
volumesetting.leftvol = 32767;
volumesetting.rightvol = 32767;
} else { } else {
volumesetting.rightvol = 32767; volumesetting.rightvol = 32767;
volumesetting.leftvol = (Bit16s)((127 - pan) * 516); volumesetting.leftvol = (Bit16s)((127 - pan) * 520);
} }
//synth->printDebug("%s (%s): Set pan to %d", name, currentInstr, panpot); //synth->printDebug("%s (%s): Set pan to %d", name, currentInstr, panpot);
} }
void Part::playNote(PartialManager *partialManager, int f, int vel) { void Part::playNote(PartialManager *partialManager, unsigned int key, int vel) {
int drumNum = -1; // Initialised to please compiler int drumNum = -1; // Initialised to please compiler
int drumTimbre = -1; // As above int drumTimbre = -1; // As above
int freqNum; int freqNum;
if (isRhythm) { if (isRhythm) {
if (f < 24 || f > 87) { if (key < 24 || key > 87) {
synth->printDebug("%s: Attempted to play invalid note %d", name, f); synth->printDebug("%s: Attempted to play invalid key %d", name, key);
return; return;
} }
drumNum = f - 24; drumNum = key - 24;
drumTimbre = rhythmTemp[drumNum].timbre; drumTimbre = rhythmTemp[drumNum].timbre;
if (drumTimbre >= 94) { if (drumTimbre >= 94) {
synth->printDebug("%s: Attempted to play unmapped note %d!", name, f); synth->printDebug("%s: Attempted to play unmapped key %d", name, key);
return; return;
} }
memcpy(patchCache, drumCache[drumTimbre], sizeof(patchCache)); memcpy(patchCache, drumCache[drumTimbre], sizeof(patchCache));
memcpy(&currentInstr, synth->mt32ram.params.timbres[128 + drumTimbre].timbre.common.name, 10); memcpy(&currentInstr, synth->mt32ram.params.timbres[128 + drumTimbre].timbre.common.name, 10);
currentInstr[10] = 0;
freqNum = MIDDLEC; freqNum = MIDDLEC;
} else { } else {
if (f < 12 || f > 108) { if (key < 12) {
synth->printDebug("%s (%s): Attempted to play invalid note %d", name, currentInstr, f); synth->printDebug("%s (%s): Attempted to play invalid key %d < 12; moving up by octave", name, currentInstr, key);
return; key += 12;
} else if (key > 108) {
synth->printDebug("%s (%s): Attempted to play invalid key %d > 108; moving down by octave", name, currentInstr, key);
while (key > 108) {
key -= 12;
}
} }
freqNum = f; freqNum = key;
} }
// POLY1 mode, Single Assign // POLY1 mode, Single Assign
// Haven't found any software that uses any of the other poly modes // Haven't found any software that uses any of the other poly modes
// FIXME:KG: Should this also apply to rhythm? // FIXME:KG: Should this also apply to rhythm?
if (!isRhythm) { if (!isRhythm) {
for (int i = 0; i < MT32EMU_MAX_POLY; i++) { for (unsigned int i = 0; i < MT32EMU_MAX_POLY; i++) {
if (polyTable[i].isActive() && (polyTable[i].note == f)) { if (polyTable[i].isActive() && (polyTable[i].key == key)) {
//AbortPoly(&polyTable[i]); //AbortPoly(&polyTable[i]);
stopNote(f); stopNote(key);
break; break;
} }
} }
@ -453,11 +458,11 @@ void Part::playNote(PartialManager *partialManager, int f, int vel) {
if (needPartials > partialManager->GetFreePartialCount()) { if (needPartials > partialManager->GetFreePartialCount()) {
if (!partialManager->FreePartials(needPartials, partNum)) { if (!partialManager->FreePartials(needPartials, partNum)) {
synth->printDebug("%s (%s): Insufficient free partials to play note %d (vel=%d)", name, currentInstr, f, vel); synth->printDebug("%s (%s): Insufficient free partials to play key %d (vel=%d)", name, currentInstr, key, vel);
return; return;
} }
} }
// Find free note // Find free poly
int m; int m;
for (m = 0; m < MT32EMU_MAX_POLY; m++) { for (m = 0; m < MT32EMU_MAX_POLY; m++) {
if (!polyTable[m].isActive()) { if (!polyTable[m].isActive()) {
@ -465,17 +470,15 @@ void Part::playNote(PartialManager *partialManager, int f, int vel) {
} }
} }
if (m == MT32EMU_MAX_POLY) { if (m == MT32EMU_MAX_POLY) {
synth->printDebug("%s (%s): No free poly to play note %d (vel %d)", name, currentInstr, f, vel); synth->printDebug("%s (%s): No free poly to play key %d (vel %d)", name, currentInstr, key, vel);
return; return;
} }
dpoly *tpoly = &polyTable[m]; dpoly *tpoly = &polyTable[m];
Bit16s freq = freqtable[freqNum];
tpoly->isPlaying = true; tpoly->isPlaying = true;
tpoly->note = f; tpoly->key = key;
tpoly->isDecay = false; tpoly->isDecay = false;
tpoly->freq = freq;
tpoly->freqnum = freqNum; tpoly->freqnum = freqNum;
tpoly->vel = vel; tpoly->vel = vel;
tpoly->pedalhold = false; tpoly->pedalhold = false;
@ -505,9 +508,9 @@ void Part::playNote(PartialManager *partialManager, int f, int vel) {
#if MT32EMU_MONITOR_INSTRUMENTS == 1 #if MT32EMU_MONITOR_INSTRUMENTS == 1
if (isRhythm) { if (isRhythm) {
synth->printDebug("%s (%s): starting poly %d (drum %d, timbre %d) - Vel %d Key %d Vol %d", name, currentInstr, m, drumNum, drumTimbre, vel, f, volume); synth->printDebug("%s (%s): starting poly %d (drum %d, timbre %d) - Vel %d Key %d Vol %d", name, currentInstr, m, drumNum, drumTimbre, vel, key, volume);
} else { } else {
synth->printDebug("%s (%s): starting poly %d - Vel %d Key %d Vol %d", name, currentInstr, m, vel, f, volume); synth->printDebug("%s (%s): starting poly %d - Vel %d Key %d Vol %d", name, currentInstr, m, vel, key, volume);
} }
#endif #endif
@ -548,23 +551,22 @@ void Part::stopPedalHold() {
dpoly *tpoly; dpoly *tpoly;
tpoly = &polyTable[q]; tpoly = &polyTable[q];
if (tpoly->isActive() && tpoly->pedalhold) if (tpoly->isActive() && tpoly->pedalhold)
stopNote(tpoly->note); stopNote(tpoly->key);
} }
} }
void Part::stopNote(int f) { void Part::stopNote(unsigned int key) {
// Non-sustaining instruments ignore stop note commands. // Non-sustaining instruments ignore stop commands.
// They die away eventually anyway // They die away eventually anyway
//if (!tpoly->sustain) return;
#if MT32EMU_MONITOR_INSTRUMENTS == 1 #if MT32EMU_MONITOR_INSTRUMENTS == 1
synth->printDebug("%s (%s): stopping key %d", name, currentInstr, f); synth->printDebug("%s (%s): stopping key %d", name, currentInstr, key);
#endif #endif
if (f != -1) { if (key != 255) {
for (int q = 0; q < MT32EMU_MAX_POLY; q++) { for (int q = 0; q < MT32EMU_MAX_POLY; q++) {
dpoly *tpoly = &polyTable[q]; dpoly *tpoly = &polyTable[q];
if (tpoly->isPlaying && tpoly->note == f) { if (tpoly->isPlaying && tpoly->key == key) {
if (holdpedal) if (holdpedal)
tpoly->pedalhold = true; tpoly->pedalhold = true;
else if (tpoly->sustain) else if (tpoly->sustain)
@ -574,7 +576,7 @@ void Part::stopNote(int f) {
return; return;
} }
// Find oldest note... yes, the MT-32 can be reconfigured to kill different note first // Find oldest poly... yes, the MT-32 can be reconfigured to kill different poly first
// This is simplest // This is simplest
int oldest = -1; int oldest = -1;
Bit64s oldage = -1; Bit64s oldage = -1;

4
backends/midi/mt32/part.h
View file

@ -63,8 +63,8 @@ private:
public: public:
Part(Synth *synth, int usePartNum); Part(Synth *synth, int usePartNum);
char *getName(); char *getName();
void playNote(PartialManager *partialManager, int f, int vel); void playNote(PartialManager *partialManager, unsigned int key, int vel);
void stopNote(int f); void stopNote(unsigned int key);
void allStop(); void allStop();
void setVolume(int vol); void setVolume(int vol);
void setPan(int vol); void setPan(int vol);

3
backends/midi/mt32/partial.cpp
View file

@ -361,7 +361,6 @@ Bit16s *Partial::generateSamples(long length) {
else else
ptemp = waveforms[3][noteVal][waveoff % waveformsize[3][noteVal]]; ptemp = waveforms[3][noteVal][waveoff % waveformsize[3][noteVal]];
ptemp = ptemp * 4; ptemp = ptemp * 4;
// This is the correct way // This is the correct way
// Seems slow to me (though bandlimited) -- doesn't seem to // Seems slow to me (though bandlimited) -- doesn't seem to
// sound any better though // sound any better though
@ -654,7 +653,7 @@ Bit32s Partial::getFiltEnvelope() {
tStat->envbase = patchCache->filtEnv.envlevel[tStat->envstat]; tStat->envbase = patchCache->filtEnv.envlevel[tStat->envstat];
tStat->envstat++; tStat->envstat++;
tStat->envpos = 0; tStat->envpos = 0;
if (tStat->envstat==3) if (tStat->envstat == 3)
tStat->envsize = lasttimetable[(int)patchCache->filtEnv.envtime[tStat->envstat]]; tStat->envsize = lasttimetable[(int)patchCache->filtEnv.envtime[tStat->envstat]];
else else
tStat->envsize = (envtimetable[(int)patchCache->filtEnv.envtime[tStat->envstat]] * timekeytable[(int)patchCache->filtEnv.envtkf][poly->freqnum]) >> 8; tStat->envsize = (envtimetable[(int)patchCache->filtEnv.envtime[tStat->envstat]] * timekeytable[(int)patchCache->filtEnv.envtkf][poly->freqnum]) >> 8;

26
backends/midi/mt32/partialManager.cpp
View file

@ -27,30 +27,30 @@ using namespace MT32Emu;
PartialManager::PartialManager(Synth *useSynth) { PartialManager::PartialManager(Synth *useSynth) {
this->synth = useSynth; this->synth = useSynth;
for (int i = 0; i < MAXPARTIALS; i++) for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++)
partialTable[i] = new Partial(synth); partialTable[i] = new Partial(synth);
} }
PartialManager::~PartialManager(void) { PartialManager::~PartialManager(void) {
for (int i = 0; i < MAXPARTIALS; i++) for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++)
delete partialTable[i]; delete partialTable[i];
} }
void PartialManager::GetPerPartPartialUsage(int usage[9]) { void PartialManager::GetPerPartPartialUsage(int usage[9]) {
memset(usage, 0, 9 * sizeof (int)); memset(usage, 0, 9 * sizeof (int));
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (partialTable[i]->isActive()) if (partialTable[i]->isActive())
usage[partialTable[i]->getOwnerPart()]++; usage[partialTable[i]->getOwnerPart()]++;
} }
} }
void PartialManager::ClearAlreadyOutputed() { void PartialManager::ClearAlreadyOutputed() {
for (int i = 0; i < MAXPARTIALS; i++) for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++)
partialTable[i]->alreadyOutputed = false; partialTable[i]->alreadyOutputed = false;
} }
void PartialManager::AgeAll() { void PartialManager::AgeAll() {
for (int i = 0; i < MAXPARTIALS; i++) for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++)
partialTable[i]->age++; partialTable[i]->age++;
} }
@ -63,7 +63,7 @@ bool PartialManager::ProduceOutput(int i, Bit16s *buffer, Bit32u bufferLength) {
} }
void PartialManager::DeactivateAll() { void PartialManager::DeactivateAll() {
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
partialTable[i]->deactivate(); partialTable[i]->deactivate();
} }
} }
@ -84,7 +84,7 @@ Partial * PartialManager::AllocPartial(int partNum) {
// Use the first inactive partial reserved for the specified part (if there are any) // Use the first inactive partial reserved for the specified part (if there are any)
// Otherwise, use the last inactive partial, if any // Otherwise, use the last inactive partial, if any
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (!partialTable[i]->isActive()) { if (!partialTable[i]->isActive()) {
outPartial = partialTable[i]; outPartial = partialTable[i];
if (PartialReserveTable[i] == partNum) if (PartialReserveTable[i] == partNum)
@ -101,7 +101,7 @@ Partial * PartialManager::AllocPartial(int partNum) {
unsigned int PartialManager::GetFreePartialCount(void) { unsigned int PartialManager::GetFreePartialCount(void) {
int count = 0; int count = 0;
memset(partialPart, 0, sizeof(partialPart)); memset(partialPart, 0, sizeof(partialPart));
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (!partialTable[i]->isActive()) if (!partialTable[i]->isActive())
count++; count++;
else else
@ -147,7 +147,7 @@ bool PartialManager::FreePartials(unsigned int needed, int partNum) {
oldest = -1; oldest = -1;
oldnum = -1; oldnum = -1;
found = false; found = false;
for (i = 0; i < MAXPARTIALS; i++) { for (i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (partialTable[i]->isActive) { if (partialTable[i]->isActive) {
if (partialTable[i]->ownerPart == selectPart) { if (partialTable[i]->ownerPart == selectPart) {
found = true; found = true;
@ -176,7 +176,7 @@ bool PartialManager::FreePartials(unsigned int needed, int partNum) {
oldest = -1; oldest = -1;
oldnum = -1; oldnum = -1;
found = false; found = false;
for (i = 0; i < MAXPARTIALS; i++) { for (i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (partialTable[i]->isActive) { if (partialTable[i]->isActive) {
if (partialTable[i]->ownerPart == partNum) { if (partialTable[i]->ownerPart == partNum) {
found = true; found = true;
@ -205,7 +205,7 @@ bool PartialManager::FreePartials(unsigned int needed, int partNum) {
// Reclaim partials reserved for this part // Reclaim partials reserved for this part
// Kill those that are already decaying first // Kill those that are already decaying first
/* /*
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (PartialReserveTable[i] == partNum) { if (PartialReserveTable[i] == partNum) {
if (partialTable[i]->ownerPart != partNum) { if (partialTable[i]->ownerPart != partNum) {
if (partialTable[i]->partCache->envs[AMPENV].decaying) { if (partialTable[i]->partCache->envs[AMPENV].decaying) {
@ -222,7 +222,7 @@ bool PartialManager::FreePartials(unsigned int needed, int partNum) {
Bit64s prior = -1; Bit64s prior = -1;
int priornum = -1; int priornum = -1;
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (PartialReserveTable[i] == partNum && partialTable[i]->isActive() && partialTable[i]->getOwnerPart() != partNum) { if (PartialReserveTable[i] == partNum && partialTable[i]->isActive() && partialTable[i]->getOwnerPart() != partNum) {
/* /*
if (mt32ram.params.system.reserveSettings[partialTable[i]->ownerPart] < prior) { if (mt32ram.params.system.reserveSettings[partialTable[i]->ownerPart] < prior) {
@ -248,7 +248,7 @@ bool PartialManager::FreePartials(unsigned int needed, int partNum) {
while (needed > 0) { while (needed > 0) {
Bit64s oldest = -1; Bit64s oldest = -1;
Bit64s oldlist = -1; Bit64s oldlist = -1;
for (int i = 0; i < MAXPARTIALS; i++) { for (int i = 0; i < MT32EMU_MAX_PARTIALS; i++) {
if (partialTable[i]->isActive()) { if (partialTable[i]->isActive()) {
if (partialTable[i]->getOwnerPart() == partNum) { if (partialTable[i]->getOwnerPart() == partNum) {
if (partialTable[i]->age > oldest) { if (partialTable[i]->age > oldest) {

6
backends/midi/mt32/partialManager.h
View file

@ -22,8 +22,6 @@
#ifndef MT32EMU_PARTIALMANAGER_H #ifndef MT32EMU_PARTIALMANAGER_H
#define MT32EMU_PARTIALMANAGER_H #define MT32EMU_PARTIALMANAGER_H
#define MAXPARTIALS 32
namespace MT32Emu { namespace MT32Emu {
class Synth; class Synth;
@ -32,8 +30,8 @@ class PartialManager {
private: private:
Synth *synth; // Only used for sending debug output Synth *synth; // Only used for sending debug output
Partial *partialTable[MAXPARTIALS]; Partial *partialTable[MT32EMU_MAX_PARTIALS];
Bit32s PartialReserveTable[MAXPARTIALS]; Bit32s PartialReserveTable[MT32EMU_MAX_PARTIALS];
Bit32s partialPart[9]; // The count of partials played per part Bit32s partialPart[9]; // The count of partials played per part
public: public:

3
backends/midi/mt32/structures.h
View file

@ -273,8 +273,7 @@ class Partial; // Forward reference for class defined in partial.h
struct dpoly { struct dpoly {
bool isPlaying; bool isPlaying;
int note; unsigned int key;
int freq;
int freqnum; int freqnum;
int vel; int vel;