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

Fixed a small problem in the Player ID3 Info Screen. Also rewrote the mute function

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1746 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Justin Heiner 2002-08-15 01:27:11 +00:00
parent cd822d2c6d
commit 4cbce72781
1 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

51
apps/wps.c
View file

@ -54,12 +54,13 @@
#define PLAY_DISPLAY_TRACK_TITLE 2 #define PLAY_DISPLAY_TRACK_TITLE 2
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
#define RELEASE_MASK (BUTTON_F1 | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT) #define RELEASE_MASK (BUTTON_F1 | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT | BUTTON_UP)
#else #else
#define RELEASE_MASK (BUTTON_MENU | BUTTON_STOP | BUTTON_LEFT | BUTTON_RIGHT) #define RELEASE_MASK (BUTTON_MENU | BUTTON_STOP | BUTTON_LEFT | BUTTON_RIGHT | BUTTON_PLAY)
#endif #endif
bool keys_locked = false; bool keys_locked = false;
bool device_muted = false;
static bool ff_rewind = false; static bool ff_rewind = false;
static void draw_screen(struct mp3entry* id3) static void draw_screen(struct mp3entry* id3)
@ -386,6 +387,7 @@ int wps_show(void)
bool dont_go_to_menu = false; bool dont_go_to_menu = false;
bool menu_button_is_down = false; bool menu_button_is_down = false;
bool pending_keylock = true; /* Keylock will go ON next time */ bool pending_keylock = true; /* Keylock will go ON next time */
bool pending_mute = true; /* Mute will go ON next time */
int old_release_mask; int old_release_mask;
int button; int button;
int ff_rewind_count = 0; int ff_rewind_count = 0;
@ -629,11 +631,14 @@ int wps_show(void)
draw_screen(id3); draw_screen(id3);
break; break;
} }
dont_go_to_menu = true;
lcd_stop_scroll(); lcd_stop_scroll();
lcd_icon(ICON_PARAM, true);
lcd_icon(ICON_AUDIO, true);
retval = player_id3_show(); retval = player_id3_show();
if(retval == SYS_USB_CONNECTED) if(retval == SYS_USB_CONNECTED)
return SYS_USB_CONNECTED; return SYS_USB_CONNECTED;
lcd_icon(ICON_PARAM, false);
lcd_icon(ICON_AUDIO, true);
draw_screen(id3); draw_screen(id3);
break; break;
@ -643,6 +648,13 @@ int wps_show(void)
menu_button_is_down = true; menu_button_is_down = true;
break; break;
case BUTTON_PLAY | BUTTON_REL:
/* The PLAY key has been release while the MENU key
was held */
if(menu_button_is_down)
pending_mute = !pending_mute;
break;
case BUTTON_STOP | BUTTON_REL: case BUTTON_STOP | BUTTON_REL:
/* The STOP key has been release while the MENU key /* The STOP key has been release while the MENU key
was held */ was held */
@ -654,6 +666,16 @@ int wps_show(void)
menu_button_is_down = true; menu_button_is_down = true;
break; break;
case BUTTON_UP | BUTTON_REL:
/* The UP key has been release while the F1 key
was held */
if(menu_button_is_down)
{
pending_mute = !pending_mute;
debugf("pending: %d\n", pending_mute);
}
break;
case BUTTON_DOWN | BUTTON_REL: case BUTTON_DOWN | BUTTON_REL:
/* The DOWN key has been release while the F1 key /* The DOWN key has been release while the F1 key
was held */ was held */
@ -668,7 +690,7 @@ int wps_show(void)
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_F1 | BUTTON_UP: case BUTTON_F1 | BUTTON_UP:
#else #else
case BUTTON_MENU | BUTTON_UP: case BUTTON_MENU | BUTTON_PLAY:
#endif #endif
if(keys_locked) if(keys_locked)
{ {
@ -676,22 +698,19 @@ int wps_show(void)
draw_screen(id3); draw_screen(id3);
break; break;
} }
dont_go_to_menu = true;
if(global_settings.muted == false) if(device_muted != pending_mute)
{ {
global_settings.muted = true; device_muted = pending_mute;
mpeg_sound_set(SOUND_VOLUME, 0);
display_mute_text(global_settings.muted); if(device_muted)
draw_screen(id3); mpeg_sound_set(SOUND_VOLUME, 0);
} else
else mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
{ display_mute_text(device_muted);
global_settings.muted = false;
mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
display_mute_text(global_settings.muted);
draw_screen(id3); draw_screen(id3);
} }
dont_go_to_menu = true;
break; break;
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD