The synthVoice() function declaration was wrong (caused a warning). And because of that GCC didn't notice the error on line 390: synthVoice(currentVoice).
In revision 1.4 Steven made currentVoice global, so the function declaration should be: synthVoice(void), wich fixes a warning. And the call should be just synthVoice() wich fixes a hidden error. Hope I saw this right... please correct me if this isn't the way you ment is Seven. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6708 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
ef72f99681
commit
2ed84ec2ca
1 changed files with 2 additions and 2 deletions
|
@ -270,7 +270,7 @@ inline void stopVoice(struct SynthObject * so)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline signed short int synthVoice()
|
inline signed short int synthVoice(void)
|
||||||
{
|
{
|
||||||
so = &voices[currentVoice];
|
so = &voices[currentVoice];
|
||||||
wf = so->wf;
|
wf = so->wf;
|
||||||
|
@ -387,7 +387,7 @@ inline void synthSample(int * mixL, int * mixR)
|
||||||
{
|
{
|
||||||
if(voices[currentVoice].isUsed==1)
|
if(voices[currentVoice].isUsed==1)
|
||||||
{
|
{
|
||||||
sample = synthVoice(currentVoice);
|
sample = synthVoice();
|
||||||
*mixL += (sample*chPanLeft[voices[currentVoice].ch])>>7;
|
*mixL += (sample*chPanLeft[voices[currentVoice].ch])>>7;
|
||||||
*mixR += (sample*chPanRight[voices[currentVoice].ch])>>7;
|
*mixR += (sample*chPanRight[voices[currentVoice].ch])>>7;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue