chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Added a hack to playptmod to detect 7-bit versus 8-bit panning

Browse source
This commit is contained in:
Chris Moeller 2014-09-29 19:30:11 -07:00
parent f6bf26c58a
commit 91c10ea197
1 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Frameworks/playptmod/playptmod/playptmod.c
View file

@ -1,7 +1,10 @@
/* /*
** - playptmod v1.15 - 29th of September 2014 - ** - playptmod v1.15b - 29th of September 2014 -
** This is the foobar2000 version, with code by kode54 ** This is the foobar2000 version, with code by kode54
** **
** Changelog from 1.15a:
** - Added a hack to find out what 8xx pan is used (7-bit/8-bit)
**
** Changelog from 1.10d: ** Changelog from 1.10d:
** - Removed obsolete IFF sample handling (FT2/PT didn't have it) ** - Removed obsolete IFF sample handling (FT2/PT didn't have it)
** - Added two Ultimate Soundtracker sample loading hacks ** - Added two Ultimate Soundtracker sample loading hacks
@ -142,8 +145,8 @@ typedef struct
typedef struct typedef struct
{ {
char moduleLoaded; char moduleLoaded;
char *sampleData; signed char *sampleData;
char *originalSampleData; signed char *originalSampleData;
MODULE_HEADER head; MODULE_HEADER head;
MODULE_SAMPLE samples[31]; MODULE_SAMPLE samples[31];
modnote_t *patterns[256]; modnote_t *patterns[256];
@ -163,8 +166,8 @@ typedef struct paula_filter_coefficients
typedef struct voice_data typedef struct voice_data
{ {
const char *newData; const signed char *newData;
const char *data; const signed char *data;
char swapSampleFlag; char swapSampleFlag;
char loopFlag; char loopFlag;
int length; int length;
@ -230,6 +233,7 @@ typedef struct
int sampleCounter; int sampleCounter;
int samplesPerTick; int samplesPerTick;
int vBlankTiming; int vBlankTiming;
int sevenBitPanning;
Voice v[MAX_CHANNELS]; Voice v[MAX_CHANNELS];
Filter filter; Filter filter;
FilterC filterC; FilterC filterC;
@ -411,7 +415,7 @@ static inline int periodToNote(player *p, char finetune, short period)
return i; return i;
} }
static void mixerSwapChSource(player *p, int ch, const char *src, int length, int loopStart, int loopLength, int step) static void mixerSwapChSource(player *p, int ch, const signed char *src, int length, int loopStart, int loopLength, int step)
{ {
Voice *v; Voice *v;
@ -449,7 +453,7 @@ static void mixerSwapChSource(player *p, int ch, const char *src, int length, in
} }
} }
static void mixerSetChSource(player *p, int ch, const char *src, int length, int loopStart, int loopLength, int offset, int step) static void mixerSetChSource(player *p, int ch, const signed char *src, int length, int loopStart, int loopLength, int offset, int step)
{ {
Voice *v; Voice *v;
@ -871,7 +875,7 @@ static int playptmod_LoadMTM(player *p, BUF *fmodule)
} }
} }
p->source->sampleData = (char *)malloc(totalSampleSize); p->source->sampleData = (signed char *)malloc(totalSampleSize);
if (!p->source->sampleData) if (!p->source->sampleData)
{ {
for (i = 0; i < 256; ++i) for (i = 0; i < 256; ++i)
@ -903,7 +907,7 @@ static int playptmod_LoadMTM(player *p, BUF *fmodule)
sampleOffset += s->length; sampleOffset += s->length;
} }
p->source->originalSampleData = (char *)malloc(totalSampleSize); p->source->originalSampleData = (signed char *)malloc(totalSampleSize);
if (p->source->originalSampleData == NULL) if (p->source->originalSampleData == NULL)
{ {
free(p->source->sampleData); free(p->source->sampleData);
@ -932,6 +936,8 @@ static int playptmod_LoadMTM(player *p, BUF *fmodule)
p->source->head.format = FORMAT_MTM; p->source->head.format = FORMAT_MTM;
p->source->head.initBPM = 125; p->source->head.initBPM = 125;
p->sevenBitPanning = false;
return (true); return (true);
} }
@ -1040,6 +1046,8 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
int lateVerSTKFlag; int lateVerSTKFlag;
int numSamples; int numSamples;
int tmp; int tmp;
int leftPanning;
int extendedPanning;
unsigned long tempOffset; unsigned long tempOffset;
modnote_t *note; modnote_t *note;
MODULE_SAMPLE *s; MODULE_SAMPLE *s;
@ -1240,6 +1248,9 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
return (false); return (false);
} }
} }
leftPanning = false;
extendedPanning = false;
for (pattern = 0; pattern < p->source->head.patternCount; ++pattern) for (pattern = 0; pattern < p->source->head.patternCount; ++pattern)
{ {
@ -1292,6 +1303,19 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
note->sample = (bytes[0] & 0xF0) | HI_NYBBLE(bytes[2]); note->sample = (bytes[0] & 0xF0) | HI_NYBBLE(bytes[2]);
note->command = LO_NYBBLE(bytes[2]); note->command = LO_NYBBLE(bytes[2]);
note->param = bytes[3]; note->param = bytes[3];
// 7-bit/8-bit styled pan hack, from OpenMPT
if (note->command == 0x08)
{
if (note->param < 0x80)
leftPanning = true;
// Saga_Musix says: 8F instead of 80 is not a typo but
// required for a few mods which have 7-bit panning
// with slightly too big values
if ((note->param > 0x8F) && (note->param != 0xA4))
extendedPanning = true;
}
if (mightBeSTK) if (mightBeSTK)
{ {
@ -1338,6 +1362,10 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
} }
} }
} }
p->sevenBitPanning = false;
if (leftPanning && !extendedPanning)
p->sevenBitPanning = true;
tempOffset = buftell(fmodule); tempOffset = buftell(fmodule);
@ -1365,7 +1393,7 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
p->source->head.totalSampleSize += s->length; p->source->head.totalSampleSize += s->length;
} }
p->source->sampleData = (char *)malloc(p->source->head.totalSampleSize); p->source->sampleData = (signed char *)malloc(p->source->head.totalSampleSize);
if (p->source->sampleData == NULL) if (p->source->sampleData == NULL)
{ {
bufclose(fmodule); bufclose(fmodule);
@ -1418,7 +1446,7 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
} }
} }
p->source->originalSampleData = (char *) malloc(p->source->head.totalSampleSize); p->source->originalSampleData = (signed char *) malloc(p->source->head.totalSampleSize);
if (p->source->originalSampleData == NULL) if (p->source->originalSampleData == NULL)
{ {
bufclose(fmodule); bufclose(fmodule);
@ -1616,10 +1644,6 @@ static effect_routine efxRoutines_FT2[16] =
static void processInvertLoop(player *p, mod_channel *ch) static void processInvertLoop(player *p, mod_channel *ch)
{ {
char invertLoopTemp;
char *invertLoopData;
MODULE_SAMPLE *s;
if (ch->invertLoopSpeed > 0) if (ch->invertLoopSpeed > 0)
{ {
ch->invertLoopDelay += invertLoopSpeeds[ch->invertLoopSpeed]; ch->invertLoopDelay += invertLoopSpeeds[ch->invertLoopSpeed];
@ -2389,7 +2413,17 @@ static void processEffects(player *p, mod_channel *ch)
static void fxPan(player *p, mod_channel *ch) static void fxPan(player *p, mod_channel *ch)
{ {
if (p->modTick == 0) if (p->modTick == 0)
mixerSetChPan(p, ch->chanIndex, ch->param <= 128 ? ch->param * 2 : 128); {
if (p->sevenBitPanning)
{
if (ch->param != 0xA4) // don't do 0xA4 surround yet
mixerSetChPan(p, ch->chanIndex, ch->param * 2); // 7-bit .MOD pan
}
else
{
mixerSetChPan(p, ch->chanIndex, ch->param); // 8-bit .MOD pan
}
}
} }
static void efxPan(player *p, mod_channel *ch) static void efxPan(player *p, mod_channel *ch)
@ -2725,7 +2759,7 @@ void playptmod_Render16(void *_p, short *target, int length)
temp = target ? tempBuffer : NULL; temp = target ? tempBuffer : NULL;
while (length) while (length)
{ {
tempSamples = CLAMP(length, 0, 256); int tempSamples = CLAMP(length, 0, 256);
playptmod_Render(p, temp, tempSamples); playptmod_Render(p, temp, tempSamples);
length -= tempSamples; length -= tempSamples;