etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-23 13:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

S3M import: stereo samples and SCx/SDx effects

Browse source
This commit is contained in:
tildearrow 2024-06-24 05:12:43 -05:00
parent 63f8289847
commit 55a8bb2448
1 changed files with 57 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/engine/fileOps/s3m.cpp
View file

@ -353,8 +353,6 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
logV("length: %x",length);
DivSample* s=new DivSample;
s->depth=DIV_SAMPLE_DEPTH_8BIT;
s->init(length);
s->loopStart=reader.readI();
s->loopEnd=reader.readI();
@ -393,16 +391,7 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
s->loop=flags&1;
s->depth=(flags&4)?DIV_SAMPLE_DEPTH_16BIT:DIV_SAMPLE_DEPTH_8BIT;
s->init(length>>(s->depth==DIV_SAMPLE_DEPTH_16BIT?1:0));
if (flags&2) {
logE("stereo sample!");
lastError="stereo sample";
delete ins;
delete s;
delete[] file;
return false;
}
s->init(length);
if (isPacked) {
logE("ADPCM not supported!");
@ -413,7 +402,41 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
return false;
}
reader.read(s->getCurBuf(),length);
if (flags&2) {
// downmix stereo
if (s->depth==DIV_SAMPLE_DEPTH_16BIT) {
for (unsigned int i=0; i<s->samples; i++) {
short l=reader.readS();
if (!signedSamples) {
l^=0x8000;
}
s->data16[i]=l;
}
for (unsigned int i=0; i<s->samples; i++) {
short r=reader.readS();
if (!signedSamples) {
r^=0x8000;
}
s->data16[i]=(s->data16[i]+r)>>1;
}
} else {
for (unsigned int i=0; i<s->samples; i++) {
signed char l=reader.readC();
if (!signedSamples) {
l^=0x80;
}
s->data8[i]=l;
}
for (unsigned int i=0; i<s->samples; i++) {
signed char r=reader.readC();
if (!signedSamples) {
r^=0x80;
}
s->data8[i]=(s->data8[i]+r)>>1;
}
}
} else {
reader.read(s->getCurBuf(),s->samples);
if (!signedSamples) {
if (s->depth==DIV_SAMPLE_DEPTH_16BIT) {
@ -426,6 +449,7 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
}
}
}
}
ins->amiga.initSample=ds.sample.size();
ds.sample.push_back(s);
@ -673,7 +697,7 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
if (porting[j]!=portingOld[j] || portaStatusChanged[j]) {
if (portaStatus[j]>=0xe0 && portaType[j]!=3 && porting[j]) {
p->data[curRow][effectCol[j]++]=portaType[j]|0xf0;
p->data[curRow][effectCol[j]++]=(portaStatus[j]&15)*((portaStatus[j]>=0xf0)?4:1);
p->data[curRow][effectCol[j]++]=(portaStatus[j]&15)*((portaStatus[j]>=0xf0)?1:1);
porting[j]=false;
} else {
p->data[curRow][effectCol[j]++]=portaType[j];
@ -872,12 +896,27 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
case 'R': // tremolo
break;
case 'S': // special...
switch (effectVal>>4) {
case 0xc:
p->data[curRow][effectCol[chan]++]=0xec;
p->data[curRow][effectCol[chan]++]=effectVal&15;
break;
case 0xd:
p->data[curRow][effectCol[chan]++]=0xed;
p->data[curRow][effectCol[chan]++]=effectVal&15;
break;
}
break;
case 'T': // tempo
p->data[curRow][effectCol[chan]++]=0xf0;
p->data[curRow][effectCol[chan]++]=effectVal;
break;
case 'U': // fine vibrato
if (effectVal!=0) {
vibStatus[chan]=effectVal;
vibStatusChanged[chan]=true;
}
vibing[chan]=true;
break;
case 'V': // global volume (!)
break;