kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated SCVA player with more stringent resetting.

CQTexperiment
Christopher Snowhill 2016-11-30 21:29:03 -08:00
parent 3f0415eabb
commit 26a9e2b3a1
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Plugins/MIDI/MIDI/SCPlayer.cpp
View File

@ -140,7 +140,11 @@ void SCPlayer::reset(uint32_t port)
{ {
if (initialized) if (initialized)
{ {
switch (mode) sampler[port].TG_LongMidiIn(syx_reset_xg, 0); junk(port, 1024);
sampler[port].TG_LongMidiIn(syx_reset_gm2, 0); junk(port, 1024);
sampler[port].TG_LongMidiIn(syx_reset_gm, 0); junk(port, 1024);
switch (mode)
{ {
case sc_gm: case sc_gm:
sampler[port].TG_LongMidiIn( syx_reset_gm, 0 ); sampler[port].TG_LongMidiIn( syx_reset_gm, 0 );
@ -165,28 +169,43 @@ void SCPlayer::reset(uint32_t port)
break; break;
} }
junk(port, 1024);
{ {
unsigned int i; unsigned int i;
for (i = 0; i < 16; ++i) for (i = 0; i < 16; ++i)
{ {
sampler[port].TG_ShortMidiIn( 0x78B0 + i, 0 ); sampler[port].TG_ShortMidiIn(0x78B0 + i, 0);
sampler[port].TG_ShortMidiIn( 0x79B0 + i, 0 ); sampler[port].TG_ShortMidiIn(0x79B0 + i, 0);
sampler[port].TG_ShortMidiIn(0x20B0 + i, 0);
sampler[port].TG_ShortMidiIn(0x00B0 + i, 0);
sampler[port].TG_ShortMidiIn(0xC0 + i, 0);
} }
} }
{ junk(port, uSampleRate * 2 / 3);
float temp[1024];
unsigned long i, j;
for (i = 0, j = (uSampleRate / 1536 + 1); i < j; ++i)
{
memset(temp, 0, sizeof(temp));
sampler[port].TG_setInterruptThreadIdAtThisTime();
sampler[port].TG_Process(temp, temp, 1024);
}
}
} }
} }
void SCPlayer::junk(uint32_t port, unsigned long count)
{
float temp[2][1024];
unsigned long i, j;
for (i = 0, j = count / 1024; i < j; ++i)
{
memset(temp, 0, sizeof(temp));
sampler[port].TG_setInterruptThreadIdAtThisTime();
sampler[port].TG_Process(temp[0], temp[1], 1024);
}
count %= 1024;
if (count)
{
memset(temp, 0, sizeof(temp));
sampler[port].TG_setInterruptThreadIdAtThisTime();
sampler[port].TG_Process(temp[0], temp[1], (unsigned int) count);
}
}
void SCPlayer::set_mode(sc_mode m) void SCPlayer::set_mode(sc_mode m)
{ {
mode = m; mode = m;
@ -299,7 +318,6 @@ bool SCPlayer::startup()
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
reset(i); reset(i);
sampler[i].TG_flushMidi();
} }
return true; return true;

2
Plugins/MIDI/MIDI/SCPlayer.h
View File

@ -47,6 +47,8 @@ private:
void reset(uint32_t port); void reset(uint32_t port);
void junk(uint32_t port, unsigned long count);
unsigned int instance_id; unsigned int instance_id;
bool initialized; bool initialized;
SCCore * sampler; SCCore * sampler;