Mercurial > almixer_isolated
diff ALmixer.c @ 73:32757e494675
Fixed bug that sets the wrong variable for fading in Pause.
There still seems to be another bug related to fading though based on Johnson Lin's test case. Audio no longer stops and triggers the completion callback, but the volume doesn't seem to go up to max for long fade-ins. Still investigating.
| author | Eric Wing <ewing . public |-at-| gmail . com> |
|---|---|
| date | Fri, 10 Aug 2012 22:53:14 -0700 |
| parents | be97ae4f30c0 |
| children | c112e4576832 |
line wrap: on
line diff
--- a/ALmixer.c Mon Jul 16 22:31:56 2012 -0700 +++ b/ALmixer.c Fri Aug 10 22:53:14 2012 -0700 @@ -2955,9 +2955,9 @@ ALmixer_Channel_List[channel].fade_expire_ticks - diff_time; /* Don't allow the time to go negative */ - if(ALmixer_Channel_List[channel].expire_ticks < 0) + if(ALmixer_Channel_List[channel].fade_expire_ticks < 0) { - ALmixer_Channel_List[channel].expire_ticks = 0; + ALmixer_Channel_List[channel].fade_expire_ticks = 0; } } /* End fade check */ } /* End if PLAYING */ @@ -3038,9 +3038,9 @@ ALmixer_Channel_List[i].fade_expire_ticks - diff_time; /* Don't allow the time to go negative */ - if(ALmixer_Channel_List[i].expire_ticks < 0) + if(ALmixer_Channel_List[i].fade_expire_ticks < 0) { - ALmixer_Channel_List[i].expire_ticks = 0; + ALmixer_Channel_List[i].fade_expire_ticks = 0; } } /* End fade check */ } /* End if PLAYING */