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

The status bar now keeps track of the mpeg status, instead of having to call status_set_playmode() all the time

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4806 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-06-27 01:35:33 +00:00
parent 32e27d93e8
commit 736a19266d
3 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/recorder/radio.c
View file

@ -171,8 +171,6 @@ bool radio_screen(void)
mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost); mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost);
mpeg_sound_set(SOUND_AVC, global_settings.avc); mpeg_sound_set(SOUND_AVC, global_settings.avc);
status_set_playmode(STATUS_STOP);
/* Yes, we use the D/A for monitoring */ /* Yes, we use the D/A for monitoring */
peak_meter_playback(true); peak_meter_playback(true);
@ -241,7 +239,6 @@ bool radio_screen(void)
if(mpeg_status() == MPEG_STATUS_RECORD) if(mpeg_status() == MPEG_STATUS_RECORD)
{ {
mpeg_stop(); mpeg_stop();
status_set_playmode(STATUS_STOP);
} }
else else
{ {
@ -262,7 +259,6 @@ bool radio_screen(void)
have_recorded = true; have_recorded = true;
talk_buffer_steal(); /* we use the mp3 buffer */ talk_buffer_steal(); /* we use the mp3 buffer */
mpeg_record(rec_create_filename(buf)); mpeg_record(rec_create_filename(buf));
status_set_playmode(STATUS_RECORD);
update_screen = true; update_screen = true;
} }
last_seconds = 0; last_seconds = 0;
@ -462,7 +458,6 @@ bool radio_screen(void)
if(mpeg_status() & MPEG_STATUS_ERROR) if(mpeg_status() & MPEG_STATUS_ERROR)
{ {
status_set_playmode(STATUS_STOP);
splash(0, true, str(LANG_DISK_FULL)); splash(0, true, str(LANG_DISK_FULL));
status_draw(true); status_draw(true);
lcd_update(); lcd_update();

7
apps/recorder/recording.c
View file

@ -188,8 +188,6 @@ bool recording_screen(void)
mpeg_sound_set(SOUND_VOLUME, global_settings.volume); mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
status_set_playmode(STATUS_STOP);
/* Yes, we use the D/A for monitoring */ /* Yes, we use the D/A for monitoring */
peak_meter_playback(true); peak_meter_playback(true);
@ -248,7 +246,6 @@ bool recording_screen(void)
if(mpeg_status() & MPEG_STATUS_RECORD) if(mpeg_status() & MPEG_STATUS_RECORD)
{ {
mpeg_stop(); mpeg_stop();
status_set_playmode(STATUS_STOP);
} }
else else
{ {
@ -266,7 +263,6 @@ bool recording_screen(void)
have_recorded = true; have_recorded = true;
talk_buffer_steal(); /* we use the mp3 buffer */ talk_buffer_steal(); /* we use the mp3 buffer */
mpeg_record(rec_create_filename(path_buffer)); mpeg_record(rec_create_filename(path_buffer));
status_set_playmode(STATUS_RECORD);
update_countdown = 1; /* Update immediately */ update_countdown = 1; /* Update immediately */
last_seconds = 0; last_seconds = 0;
} }
@ -275,12 +271,10 @@ bool recording_screen(void)
if(mpeg_status() & MPEG_STATUS_PAUSE) if(mpeg_status() & MPEG_STATUS_PAUSE)
{ {
mpeg_resume_recording(); mpeg_resume_recording();
status_set_playmode(STATUS_RECORD);
} }
else else
{ {
mpeg_pause_recording(); mpeg_pause_recording();
status_set_playmode(STATUS_RECORD_PAUSE);
} }
update_countdown = 1; /* Update immediately */ update_countdown = 1; /* Update immediately */
} }
@ -595,7 +589,6 @@ bool recording_screen(void)
} }
if(mpeg_status() & MPEG_STATUS_ERROR) if(mpeg_status() & MPEG_STATUS_ERROR)
{ {
status_set_playmode(STATUS_STOP);
splash(0, true, str(LANG_DISK_FULL)); splash(0, true, str(LANG_DISK_FULL));
status_draw(true); status_draw(true);
lcd_update(); lcd_update();

1
apps/screens.c
View file

@ -254,7 +254,6 @@ int charging_screen(void)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
charging_display_info(false); charging_display_info(false);
#else #else
status_set_playmode(STATUS_STOP);
lcd_puts(0, 1, "[charging]"); lcd_puts(0, 1, "[charging]");
#endif #endif