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

Fix metronome plugin crashing on SWCODEC targets and fixed a division by zero as well when tapping in the beat.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13129 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2007-04-12 17:58:42 +00:00
parent dbcd321813
commit 0569fae8ec
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/plugins/metronome.c
View file

@ -706,6 +706,9 @@ static signed short sound[] = {
}; };
int tock; int tock;
#if CONFIG_CODEC == SWCODEC
bool need_to_play = false;
#endif
short sndbuf[sizeof(sound)*2]; short sndbuf[sizeof(sound)*2];
@ -829,7 +832,12 @@ void timer_callback(void)
if(minitick >= period){ if(minitick >= period){
minitick = 0; minitick = 0;
if(!sound_active && !sound_paused && !tap_count) { if(!sound_active && !sound_paused && !tap_count) {
#if CONFIG_CODEC == SWCODEC
/* On SWCODEC we can't call play_tock() directly from an ISR. */
need_to_play = true;
#else
play_tock(); play_tock();
#endif
rb->reset_poweroff_timer(); rb->reset_poweroff_timer();
} }
} }
@ -855,7 +863,7 @@ void cleanup(void *parameter)
void tap(void) void tap(void)
{ {
if (tap_count == 0) { if (tap_count == 0 || tap_time < tap_count) {
tap_time = 0; tap_time = 0;
} }
else { else {
@ -918,9 +926,19 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
while (true){ while (true){
reset_tap = true; reset_tap = true;
#if CONFIG_CODEC == SWCODEC
button = pluginlib_getaction(rb,1,plugin_contexts,PLA_ARRAY_COUNT);
if (need_to_play)
{
need_to_play = false;
play_tock();
}
#else
button = pluginlib_getaction(rb,TIMEOUT_BLOCK, button = pluginlib_getaction(rb,TIMEOUT_BLOCK,
plugin_contexts,PLA_ARRAY_COUNT); plugin_contexts,PLA_ARRAY_COUNT);
#endif
switch (button) { switch (button) {
case METRONOME_QUIT: case METRONOME_QUIT: