diff options
author | Tomas Salfischberger <tomas@rockbox.org> | 2005-06-14 16:17:11 +0000 |
---|---|---|
committer | Tomas Salfischberger <tomas@rockbox.org> | 2005-06-14 16:17:11 +0000 |
commit | 2ed84ec2cad5497cb455ac187d99451d2f9c1b59 (patch) | |
tree | 2a65aa4a1e5374fdc8ae27e43c608f70d82815d9 | |
parent | ef72f996814301fc0ed9cc358f620e67a81486f7 (diff) | |
download | rockbox-2ed84ec2cad5497cb455ac187d99451d2f9c1b59.tar.gz rockbox-2ed84ec2cad5497cb455ac187d99451d2f9c1b59.zip |
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
-rw-r--r-- | apps/plugins/midi/synth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c index 50becf32a4..c210f046d3 100644 --- a/apps/plugins/midi/synth.c +++ b/apps/plugins/midi/synth.c | |||
@@ -270,7 +270,7 @@ inline void stopVoice(struct SynthObject * so) | |||
270 | } | 270 | } |
271 | 271 | ||
272 | 272 | ||
273 | inline signed short int synthVoice() | 273 | inline signed short int synthVoice(void) |
274 | { | 274 | { |
275 | so = &voices[currentVoice]; | 275 | so = &voices[currentVoice]; |
276 | wf = so->wf; | 276 | wf = so->wf; |
@@ -387,7 +387,7 @@ inline void synthSample(int * mixL, int * mixR) | |||
387 | { | 387 | { |
388 | if(voices[currentVoice].isUsed==1) | 388 | if(voices[currentVoice].isUsed==1) |
389 | { | 389 | { |
390 | sample = synthVoice(currentVoice); | 390 | sample = synthVoice(); |
391 | *mixL += (sample*chPanLeft[voices[currentVoice].ch])>>7; | 391 | *mixL += (sample*chPanLeft[voices[currentVoice].ch])>>7; |
392 | *mixR += (sample*chPanRight[voices[currentVoice].ch])>>7; | 392 | *mixR += (sample*chPanRight[voices[currentVoice].ch])>>7; |
393 | } | 393 | } |