len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

move button_loop to prepare for the next commit

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13677 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcoen Hirschberg 2007-06-19 21:29:34 +00:00
parent 8dc1a67bba
commit 95d414542c
1 changed files with 107 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -283,113 +283,6 @@ volatile int videostatus IBSS_ATTR;
static void pcm_playback_play_pause(bool play);
static void button_loop(void)
{
bool result;
int vol, minvol, maxvol;
int button = rb->button_get(false);
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:
pcm_playback_play_pause(false);
if (videostatus != STREAM_DONE) {
videostatus=PLEASE_PAUSE;
/* Wait for video thread to stop */
while (videostatus == PLEASE_PAUSE) { rb->sleep(HZ/25); }
}
#ifndef HAVE_LCD_COLOR
gray_show(false);
#endif
result = mpeg_menu();
#ifndef HAVE_LCD_COLOR
gray_show(true);
#endif
/* The menu can change the font, so restore */
rb->lcd_setfont(FONT_SYSFIXED);
if (result) {
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
} else {
if (videostatus != STREAM_DONE) videostatus = STREAM_PLAYING;
pcm_playback_play_pause(true);
}
break;
case MPEG_STOP:
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
break;
case MPEG_PAUSE:
if (videostatus != STREAM_DONE) videostatus=PLEASE_PAUSE;
pcm_playback_play_pause(false);
button = BUTTON_NONE;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(false);
#endif
do {
button = rb->button_get(true);
if (button == MPEG_STOP) {
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
return;
}
} while (button != MPEG_PAUSE);
if (videostatus != STREAM_DONE) videostatus = STREAM_PLAYING;
pcm_playback_play_pause(true);
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true);
#endif
break;
default:
if(rb->default_event_handler(button) == SYS_USB_CONNECTED) {
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
}
}
}
/* libmad related functions/definitions */
#define INPUT_CHUNK_SIZE 8192
@ -960,6 +853,113 @@ static inline int32_t clip_sample(int32_t sample)
return sample;
}
static void button_loop(void)
{
bool result;
int vol, minvol, maxvol;
int button = rb->button_get(false);
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:
pcm_playback_play_pause(false);
if (videostatus != STREAM_DONE) {
videostatus=PLEASE_PAUSE;
/* Wait for video thread to stop */
while (videostatus == PLEASE_PAUSE) { rb->sleep(HZ/25); }
}
#ifndef HAVE_LCD_COLOR
gray_show(false);
#endif
result = mpeg_menu();
#ifndef HAVE_LCD_COLOR
gray_show(true);
#endif
/* The menu can change the font, so restore */
rb->lcd_setfont(FONT_SYSFIXED);
if (result) {
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
} else {
if (videostatus != STREAM_DONE) videostatus = STREAM_PLAYING;
pcm_playback_play_pause(true);
}
break;
case MPEG_STOP:
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
break;
case MPEG_PAUSE:
if (videostatus != STREAM_DONE) videostatus=PLEASE_PAUSE;
pcm_playback_play_pause(false);
button = BUTTON_NONE;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(false);
#endif
do {
button = rb->button_get(true);
if (button == MPEG_STOP) {
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
return;
}
} while (button != MPEG_PAUSE);
if (videostatus != STREAM_DONE) videostatus = STREAM_PLAYING;
pcm_playback_play_pause(true);
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true);
#endif
break;
default:
if(rb->default_event_handler(button) == SYS_USB_CONNECTED) {
audiostatus = PLEASE_STOP;
if (videostatus != STREAM_DONE) videostatus = PLEASE_STOP;
}
}
}
static void audio_thread(void)
{
uint8_t *mpabuf = mpa_buffer;