devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Added xxx2wav support, an icon, and some optimizations

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6306 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Stepan Moskovchenko 2005-04-16 03:35:20 +00:00
parent cdd35ba220
commit 4b773c0c4c
4 changed files with 48 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/midi/guspat.c
View file

@ -66,6 +66,18 @@ struct GWaveform * loadWaveform(int file)
wav->res=readData(file, 36);
wav->data=readData(file, wav->wavSize);
int a=0;
//If we have a 16 bit waveform
if(wav->mode & 1 && (wav->mode & 2))
{
for(a=0; a<wav->wavSize; a+=2) //Convert it to
{
//wav->data[a]=wav->data[a]; //+((wav->mode & 2) << 6);
wav->data[a|1]=wav->data[(a)|1]+(1 << 7);
}
}
return wav;
}

22
apps/plugins/midi/synth.c
View file

@ -186,10 +186,7 @@ inline signed short int getSample(struct GWaveform * wf, unsigned int s)
{
if(s<<1 >= wf->wavSize)
{
// printf("\nSAMPLE OUT OF RANGE: s=%d 2s=%d ws=%d", s, 2*s, wf->wavSize);
return 0;
}
/*
@ -198,14 +195,14 @@ inline signed short int getSample(struct GWaveform * wf, unsigned int s)
*/
//If they are unsigned, convert them to signed
//or was it the other way around. Whatever, it works
unsigned char b1=wf->data[s<<1]+((wf->mode & 2) << 6);
unsigned char b2=wf->data[(s<<1)|1]+((wf->mode & 2) << 6);
return (b1 | (b2<<8));
//Sign conversion moved into guspat.c
unsigned char b1=wf->data[s<<1]; //+((wf->mode & 2) << 6);
unsigned char b2=wf->data[(s<<1)|1]; //+((wf->mode & 2) << 6);
return (b1 | (b2<<8)) ;
}
else
{ //8-bit samples
{ //8-bit samples
//Do we even have anything 8-bit in our set?
unsigned char b1=wf->data[s]+((wf->mode & 2) << 6);
return b1<<8;
}
@ -237,10 +234,6 @@ inline void setPoint(struct SynthObject * so, int pt)
so->curPoint = pt;
int r=0;
int rate = so->wf->envRate[pt];
r=3-((rate>>6) & 0x3); // Some blatant Timidity code for rate conversion...
@ -256,7 +249,7 @@ inline void setPoint(struct SynthObject * so, int pt)
default this to 10, and maybe later have an option to set it to 9
for longer decays.
*/
so->curRate = r<<9;
so->curRate = r<<10;
so->targetOffset = so->wf->envOffset[pt]<<(20);
@ -372,6 +365,7 @@ inline signed short int synthVoice(int v)
if(so->curOffset < 0)
so->isUsed=0; //This is OK
s = s * (so->curOffset >> 22);
s = s>>6;