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

Fixed the metronome plugin crashing on target. Fixes <a href='http://www.rockbox.org/tracker/task/7421'>FS#7421</a>

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14051 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kevin Ferrare 2007-07-29 05:30:04 +00:00
parent f68ab0d497
commit a2b14a5340
1 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

80
apps/plugins/metronome.c
View file

@ -34,10 +34,10 @@ enum {
METRONOME_PLAY_TAP = LAST_PLUGINLIB_ACTION+1, METRONOME_PLAY_TAP = LAST_PLUGINLIB_ACTION+1,
#if CONFIG_KEYPAD == ONDIO_PAD #if CONFIG_KEYPAD == ONDIO_PAD
METRONOME_PAUSE, METRONOME_PAUSE,
#endif #endif /* ONDIO_PAD */
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
METRONOME_SYNC METRONOME_SYNC
#endif #endif /* IRIVER_H100_PAD||IRIVER_H300_PAD */
}; };
@ -51,7 +51,7 @@ static const struct button_mapping ondio_action[] =
{METRONOME_PAUSE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, {METRONOME_PAUSE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
{CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE} {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
}; };
#else #else /* !ONDIO_PAD */
#define METRONOME_TAP PLA_FIRE #define METRONOME_TAP PLA_FIRE
#define METRONOME_PLAYPAUSE PLA_START #define METRONOME_PLAYPAUSE PLA_START
#define METRONOME_MSG_START "press play" #define METRONOME_MSG_START "press play"
@ -64,9 +64,18 @@ static const struct button_mapping iriver_syncaction[] =
{METRONOME_SYNC, BUTTON_REC, BUTTON_NONE }, {METRONOME_SYNC, BUTTON_REC, BUTTON_NONE },
{CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE} {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
}; };
#endif #endif /* IRIVER_H100_PAD||IRIVER_H300_PAD */
#endif /* #if CONFIG_KEYPAD == ONDIO_PAD */ #endif /* #if CONFIG_KEYPAD == ONDIO_PAD */
const struct button_mapping *plugin_contexts[]={
generic_directions,
#if CONFIG_KEYPAD == ONDIO_PAD
ondio_action,
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
iriver_syncaction,
#endif
generic_actions
};
static struct plugin_api* rb; static struct plugin_api* rb;
@ -81,7 +90,7 @@ static bool sound_paused = true;
static char buffer[30]; static char buffer[30];
static bool reset_tap = false; static bool reset_tap = false;
static int tap_count = 0; static int tap_count = 0;
static int tap_time = 0; static int tap_time = 0;
static int tap_timeout = 0; static int tap_timeout = 0;
@ -93,8 +102,6 @@ int bpm_step_counter = 0;
#define MET_IS_PLAYING rb->mp3_is_playing() #define MET_IS_PLAYING rb->mp3_is_playing()
#define MET_PLAY_STOP rb->mp3_play_stop() #define MET_PLAY_STOP rb->mp3_play_stop()
void callback(unsigned char** start, size_t* size){ void callback(unsigned char** start, size_t* size){
(void)start; /* unused parameter, avoid warning */ (void)start; /* unused parameter, avoid warning */
*size = NULL; /* end of data */ *size = NULL; /* end of data */
@ -109,16 +116,14 @@ void play_tock(void){
rb->mp3_play_pause(true); /* kickoff audio */ rb->mp3_play_pause(true); /* kickoff audio */
} }
#else #else /* CONFIG_CODEC == SWCODEC */
#define MET_IS_PLAYING rb->pcm_is_playing() #define MET_IS_PLAYING rb->pcm_is_playing()
#define MET_PLAY_STOP rb->audio_stop() #define MET_PLAY_STOP rb->audio_stop()
int tock; int tock;
#if CONFIG_CODEC == SWCODEC
bool need_to_play = false; bool need_to_play = false;
#endif
short sndbuf[sizeof(sound)*2]; short sndbuf[sizeof(sound)*2];
@ -137,7 +142,7 @@ void play_tock(void) {
tock++; tock++;
} }
#endif #endif /* CONFIG_CODEC != SWCODEC */
void calc_period(void) void calc_period(void)
{ {
@ -164,14 +169,14 @@ void metronome_draw(struct screen* display)
display->puts(0, 6, "Mode to SYNC"); display->puts(0, 6, "Mode to SYNC");
} }
#endif #endif
#endif #endif /* HAVE_LCD_BITMAP */
rb->snprintf(buffer, sizeof(buffer), "BPM: %d ",bpm); rb->snprintf(buffer, sizeof(buffer), "BPM: %d ",bpm);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
display->puts(0,3, buffer); display->puts(0,3, buffer);
#else #else
display->puts(0,0, buffer); display->puts(0,0, buffer);
#endif #endif /* HAVE_LCD_BITMAP */
rb->snprintf(buffer, sizeof(buffer), "Vol: %d", rb->snprintf(buffer, sizeof(buffer), "Vol: %d",
rb->global_settings->volume); rb->global_settings->volume);
@ -179,7 +184,7 @@ void metronome_draw(struct screen* display)
display->puts(10, 3, buffer); display->puts(10, 3, buffer);
#else #else
display->puts(0,1, buffer); display->puts(0,1, buffer);
#endif #endif /* HAVE_LCD_BITMAP */
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
display->drawline(0, 12, 111, 12); display->drawline(0, 12, 111, 12);
@ -187,7 +192,7 @@ void metronome_draw(struct screen* display)
display->puts(0,2,METRONOME_MSG_START); display->puts(0,2,METRONOME_MSG_START);
else else
display->puts(0,2,METRONOME_MSG_STOP); display->puts(0,2,METRONOME_MSG_STOP);
#endif #endif /* HAVE_LCD_BITMAP */
display->update(); display->update();
} }
@ -197,6 +202,7 @@ void draw_display(void)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
metronome_draw(rb->screens[i]); metronome_draw(rb->screens[i]);
} }
/* helper function to change the volume by a certain amount, +/- /* helper function to change the volume by a certain amount, +/-
ripped from video.c */ ripped from video.c */
void change_volume(int delta){ void change_volume(int delta){
@ -223,13 +229,13 @@ void change_bpm(int direction){
bpm = bpm + direction * 2; bpm = bpm + direction * 2;
else else
bpm = bpm + direction * 9; bpm = bpm + direction * 9;
if (bpm > 400) bpm = 400; if (bpm > 400) bpm = 400;
if (bpm < 1) bpm = 1; if (bpm < 1) bpm = 1;
calc_period(); calc_period();
draw_display(); draw_display();
bpm_step_counter++; bpm_step_counter++;
} }
void timer_callback(void) void timer_callback(void)
{ {
@ -248,7 +254,7 @@ void timer_callback(void)
else { else {
minitick++; minitick++;
} }
if (tap_count) { if (tap_count) {
tap_time++; tap_time++;
if (tap_count > 1 && tap_time > tap_timeout) if (tap_count > 1 && tap_time > tap_timeout)
@ -273,17 +279,17 @@ void tap(void)
else { else {
if (tap_time > 0) { if (tap_time > 0) {
bpm = 61440/(tap_time/tap_count); bpm = 61440/(tap_time/tap_count);
if (bpm > 400) if (bpm > 400)
bpm = 400; bpm = 400;
} }
calc_period(); calc_period();
draw_display(); draw_display();
tap_timeout = (tap_count+2)*tap_time/tap_count; tap_timeout = (tap_count+2)*tap_time/tap_count;
} }
tap_count++; tap_count++;
minitick = 0; /* sync tock to tapping */ minitick = 0; /* sync tock to tapping */
play_tock(); play_tock();
@ -293,14 +299,6 @@ void tap(void)
enum plugin_status plugin_start(struct plugin_api* api, void* parameter){ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
int button; int button;
const struct button_mapping *plugin_contexts[]
= {generic_directions,
#if CONFIG_KEYPAD == ONDIO_PAD
ondio_action,
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
iriver_syncaction,
#endif
generic_actions};
#if (CONFIG_KEYPAD == ONDIO_PAD) \ #if (CONFIG_KEYPAD == ONDIO_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H100_PAD) \ || (CONFIG_KEYPAD == IRIVER_H100_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
@ -315,7 +313,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
if (MET_IS_PLAYING) if (MET_IS_PLAYING)
MET_PLAY_STOP; /* stop audio IS */ MET_PLAY_STOP; /* stop audio IS */
#if CONFIG_CODEC != SWCODEC #if CONFIG_CODEC != SWCODEC
rb->bitswap(sound, sizeof(sound)); rb->bitswap(sound, sizeof(sound));
#else #else
@ -326,17 +324,16 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
rb->audio_set_output_source(AUDIO_SRC_PLAYBACK); rb->audio_set_output_source(AUDIO_SRC_PLAYBACK);
#endif #endif
rb->pcm_set_frequency(SAMPR_44); rb->pcm_set_frequency(SAMPR_44);
#endif #endif /* CONFIG_CODEC != SWCODEC */
calc_period(); calc_period();
rb->timer_register(1, NULL, TIMER_FREQ/1024, 1, timer_callback); rb->timer_register(1, NULL, TIMER_FREQ/1024, 1, timer_callback);
draw_display(); draw_display();
/* main loop */ /* main loop */
while (true){ while (true){
reset_tap = true; reset_tap = true;
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
button = pluginlib_getaction(rb,1,plugin_contexts,PLA_ARRAY_COUNT); button = pluginlib_getaction(rb,1,plugin_contexts,PLA_ARRAY_COUNT);
if (need_to_play) if (need_to_play)
@ -347,8 +344,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
#else #else
button = pluginlib_getaction(rb,TIMEOUT_BLOCK, button = pluginlib_getaction(rb,TIMEOUT_BLOCK,
plugin_contexts,PLA_ARRAY_COUNT); plugin_contexts,PLA_ARRAY_COUNT);
#endif #endif /* SWCODEC */
switch (button) { switch (button) {
case METRONOME_QUIT: case METRONOME_QUIT:
@ -367,13 +363,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
else else
tap(); tap();
break; break;
case METRONOME_PAUSE: case METRONOME_PAUSE:
if(!sound_paused) { if(!sound_paused) {
sound_paused = true; sound_paused = true;
draw_display(); draw_display();
} }
break; break;
#else #else
case METRONOME_PLAYPAUSE: case METRONOME_PLAYPAUSE:
if(sound_paused) if(sound_paused)
@ -383,14 +380,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
calc_period(); calc_period();
draw_display(); draw_display();
break; break;
#endif #endif /* ONDIO_PAD */
case METRONOME_VOL_UP: case METRONOME_VOL_UP:
case METRONOME_VOL_UP_REP: case METRONOME_VOL_UP_REP:
change_volume(1); change_volume(1);
calc_period(); calc_period();
break; break;
case METRONOME_VOL_DOWN: case METRONOME_VOL_DOWN:
case METRONOME_VOL_DOWN_REP: case METRONOME_VOL_DOWN_REP:
change_volume(-1); change_volume(-1);
@ -443,4 +440,3 @@ metronome_exit:
#endif #endif
return status; return status;
} }