diff options
| author | Mats Lidell <matsl@rockbox.org> | 2002-08-16 05:16:51 +0000 |
|---|---|---|
| committer | Mats Lidell <matsl@rockbox.org> | 2002-08-16 05:16:51 +0000 |
| commit | a5cc9c93cfcaa7385ee76498cf548b73d265d583 (patch) | |
| tree | b6fb78920d880c5755722375232e76faf8db8978 /apps/wps.c | |
| parent | 0edcd0a7bf12e19873db61e911c6e2dbc9684cb8 (diff) | |
| download | rockbox-a5cc9c93cfcaa7385ee76498cf548b73d265d583.zip rockbox-a5cc9c93cfcaa7385ee76498cf548b73d265d583.tar.gz rockbox-a5cc9c93cfcaa7385ee76498cf548b73d265d583.tar.bz2 rockbox-a5cc9c93cfcaa7385ee76498cf548b73d265d583.tar.xz | |
menu+left/right was broken for volume change. Patch submitted by
Magnus Holmgren.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1772 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps.c')
| -rw-r--r-- | apps/wps.c | 83 |
1 files changed, 53 insertions, 30 deletions
@@ -569,52 +569,73 @@ int wps_show(void) break; case BUTTON_LEFT | BUTTON_REL: - if (ff_rewind) + if (!keys_locked) { - /* rewind */ - mpeg_ff_rewind(ff_rewind_count); - ff_rewind_count = 0; - ff_rewind = false; - status_set_playmode(STATUS_PLAY); + if (ff_rewind) + { + /* rewind */ + mpeg_ff_rewind(ff_rewind_count); + ff_rewind_count = 0; + ff_rewind = false; + status_set_playmode(STATUS_PLAY); #ifdef HAVE_LCD_CHARCELLS - draw_screen(id3); + draw_screen(id3); #endif + } +#ifdef HAVE_PLAYER_KEYPAD + else if(!menu_button_is_down) +#else + else +#endif + { + mpeg_prev(); + status_set_playmode(STATUS_PLAY); + } } +#ifdef HAVE_PLAYER_KEYPAD + else if(!menu_button_is_down) +#else else +#endif { - if (keys_locked) - { - display_keylock_text(keys_locked); - draw_screen(id3); - break; - } - mpeg_prev(); - status_set_playmode(STATUS_PLAY); + display_keylock_text(keys_locked); + draw_screen(id3); } break; case BUTTON_RIGHT | BUTTON_REL: - if (ff_rewind) + if (!keys_locked) { - /* fast forward */ - mpeg_ff_rewind(ff_rewind_count); - ff_rewind_count = 0; - ff_rewind = false; - status_set_playmode(STATUS_PLAY); + if (ff_rewind) + { + /* fast forward */ + mpeg_ff_rewind(ff_rewind_count); + ff_rewind_count = 0; + ff_rewind = false; + status_set_playmode(STATUS_PLAY); #ifdef HAVE_LCD_CHARCELLS - draw_screen(id3); + draw_screen(id3); +#endif + } +#ifdef HAVE_PLAYER_KEYPAD + else if(!menu_button_is_down) +#else + else #endif + { + mpeg_next(); + status_set_playmode(STATUS_PLAY); + } } +#ifdef HAVE_PLAYER_KEYPAD + else if(!menu_button_is_down) +#else else +#endif { - if (keys_locked) - { - display_keylock_text(keys_locked); - draw_screen(id3); - break; - } - mpeg_next(); - status_set_playmode(STATUS_PLAY); + display_keylock_text(keys_locked); + draw_screen(id3); + break; } break; @@ -626,6 +647,7 @@ int wps_show(void) if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) global_settings.volume = mpeg_sound_min(SOUND_VOLUME); mpeg_sound_set(SOUND_VOLUME, global_settings.volume); + status_draw(); settings_save(); break; @@ -636,6 +658,7 @@ int wps_show(void) if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) global_settings.volume = mpeg_sound_max(SOUND_VOLUME); mpeg_sound_set(SOUND_VOLUME, global_settings.volume); + status_draw(); settings_save(); break; |