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

Volume control for mpegplayer - based on FS #6814 by Jacob Gardner and Pascal Briehl, modified by me (blame me for any problems). Mapped to the same buttons that are used to control volume in the WPS.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12834 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-03-18 17:04:44 +00:00
parent 2cf98689cf
commit f1bf798b8a
2 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -117,31 +117,45 @@ PLUGIN_IRAM_DECLARE
#define MPEG_MENU BUTTON_MODE #define MPEG_MENU BUTTON_MODE
#define MPEG_STOP BUTTON_OFF #define MPEG_STOP BUTTON_OFF
#define MPEG_PAUSE BUTTON_ON #define MPEG_PAUSE BUTTON_ON
#define MPEG_VOLDOWN BUTTON_DOWN
#define MPEG_VOLUP BUTTON_UP
#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
#define MPEG_MENU BUTTON_MENU #define MPEG_MENU BUTTON_MENU
#define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT)
#define MPEG_VOLDOWN BUTTON_SCROLL_BACK
#define MPEG_VOLUP BUTTON_SCROLL_FWD
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define MPEG_MENU (BUTTON_REC | BUTTON_REL) #define MPEG_MENU (BUTTON_REC | BUTTON_REL)
#define MPEG_STOP BUTTON_POWER #define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_PLAY #define MPEG_PAUSE BUTTON_PLAY
#define MPEG_VOLDOWN BUTTON_DOWN
#define MPEG_VOLUP BUTTON_UP
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
#define MPEG_MENU BUTTON_MENU #define MPEG_MENU BUTTON_MENU
#define MPEG_STOP BUTTON_A #define MPEG_STOP BUTTON_A
#define MPEG_PAUSE BUTTON_SELECT #define MPEG_PAUSE BUTTON_SELECT
#define MPEG_VOLDOWN BUTTON_DOWN
#define MPEG_VOLUP BUTTON_UP
#define MPEG_VOLDOWN2 BUTTON_VOL_DOWN
#define MPEG_VOLUP2 BUTTON_VOL_UP
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define MPEG_MENU (BUTTON_REW | BUTTON_REL) #define MPEG_MENU (BUTTON_REW | BUTTON_REL)
#define MPEG_STOP BUTTON_POWER #define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_PLAY #define MPEG_PAUSE BUTTON_PLAY
#define MPEG_VOLDOWN BUTTON_SCROLL_DOWN
#define MPEG_VOLUP BUTTON_SCROLL_UP
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define MPEG_MENU BUTTON_SELECT #define MPEG_MENU BUTTON_SELECT
#define MPEG_STOP BUTTON_POWER #define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_UP #define MPEG_PAUSE BUTTON_UP
#define MPEG_VOLDOWN BUTTON_SCROLL_UP
#define MPEG_VOLUP BUTTON_SCROLL_DOWN
#else #else
#error MPEGPLAYER: Unsupported keypad #error MPEGPLAYER: Unsupported keypad
@ -224,10 +238,43 @@ static void pause_timer(void)
static void button_loop(void) static void button_loop(void)
{ {
bool result; bool result;
int vol, minvol, maxvol;
int button = rb->button_get(false); int button = rb->button_get(false);
switch (button) switch (button)
{ {
case MPEG_VOLUP:
case MPEG_VOLUP|BUTTON_REPEAT:
#ifdef MPEG_VOLUP2
case MPEG_VOLUP2:
case MPEG_VOLUP2|BUTTON_REPEAT:
#endif
vol = rb->global_settings->volume;
maxvol = rb->sound_max(SOUND_VOLUME);
if (vol < maxvol) {
vol++;
rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
}
break;
case MPEG_VOLDOWN:
case MPEG_VOLDOWN|BUTTON_REPEAT:
#ifdef MPEG_VOLDOWN2
case MPEG_VOLDOWN2:
case MPEG_VOLDOWN2|BUTTON_REPEAT:
#endif
vol = rb->global_settings->volume;
minvol = rb->sound_min(SOUND_VOLUME);
if (vol > minvol) {
vol--;
rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
}
break;
case MPEG_MENU: case MPEG_MENU:
videostatus=PLEASE_PAUSE; videostatus=PLEASE_PAUSE;
rb->pcm_play_pause(false); rb->pcm_play_pause(false);

2
docs/CREDITS
View file

@ -283,3 +283,5 @@ Chris Ham
Jose Ramon Garcia Jose Ramon Garcia
Simon Descarpentries Simon Descarpentries
Douglas Valentine Douglas Valentine
Jacob Gardner
Pascal Briehl