diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-27 01:35:33 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-27 01:35:33 +0000 |
| commit | 736a19266d2e3fb51751b86c9b84d10dc567ecd5 (patch) | |
| tree | 16444a0680af68b2b8ea0321683776cea17c1ee9 | |
| parent | 32e27d93e883384cffb846998119ecdfd9b8fed7 (diff) | |
| download | rockbox-736a19266d2e3fb51751b86c9b84d10dc567ecd5.zip rockbox-736a19266d2e3fb51751b86c9b84d10dc567ecd5.tar.gz rockbox-736a19266d2e3fb51751b86c9b84d10dc567ecd5.tar.bz2 rockbox-736a19266d2e3fb51751b86c9b84d10dc567ecd5.tar.xz | |
The status bar now keeps track of the mpeg status, instead of having to call status_set_playmode() all the time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4806 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/recorder/radio.c | 5 | ||||
| -rw-r--r-- | apps/recorder/recording.c | 7 | ||||
| -rw-r--r-- | apps/screens.c | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index feea3fa..d6a0b82 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -171,8 +171,6 @@ bool radio_screen(void) mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost); mpeg_sound_set(SOUND_AVC, global_settings.avc); - status_set_playmode(STATUS_STOP); - /* Yes, we use the D/A for monitoring */ peak_meter_playback(true); @@ -241,7 +239,6 @@ bool radio_screen(void) if(mpeg_status() == MPEG_STATUS_RECORD) { mpeg_stop(); - status_set_playmode(STATUS_STOP); } else { @@ -262,7 +259,6 @@ bool radio_screen(void) have_recorded = true; talk_buffer_steal(); /* we use the mp3 buffer */ mpeg_record(rec_create_filename(buf)); - status_set_playmode(STATUS_RECORD); update_screen = true; } last_seconds = 0; @@ -462,7 +458,6 @@ bool radio_screen(void) if(mpeg_status() & MPEG_STATUS_ERROR) { - status_set_playmode(STATUS_STOP); splash(0, true, str(LANG_DISK_FULL)); status_draw(true); lcd_update(); diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 86b4a46..40c4169 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -188,8 +188,6 @@ bool recording_screen(void) mpeg_sound_set(SOUND_VOLUME, global_settings.volume); - status_set_playmode(STATUS_STOP); - /* Yes, we use the D/A for monitoring */ peak_meter_playback(true); @@ -248,7 +246,6 @@ bool recording_screen(void) if(mpeg_status() & MPEG_STATUS_RECORD) { mpeg_stop(); - status_set_playmode(STATUS_STOP); } else { @@ -266,7 +263,6 @@ bool recording_screen(void) have_recorded = true; talk_buffer_steal(); /* we use the mp3 buffer */ mpeg_record(rec_create_filename(path_buffer)); - status_set_playmode(STATUS_RECORD); update_countdown = 1; /* Update immediately */ last_seconds = 0; } @@ -275,12 +271,10 @@ bool recording_screen(void) if(mpeg_status() & MPEG_STATUS_PAUSE) { mpeg_resume_recording(); - status_set_playmode(STATUS_RECORD); } else { mpeg_pause_recording(); - status_set_playmode(STATUS_RECORD_PAUSE); } update_countdown = 1; /* Update immediately */ } @@ -595,7 +589,6 @@ bool recording_screen(void) } if(mpeg_status() & MPEG_STATUS_ERROR) { - status_set_playmode(STATUS_STOP); splash(0, true, str(LANG_DISK_FULL)); status_draw(true); lcd_update(); diff --git a/apps/screens.c b/apps/screens.c index a5b9f90..873f4cd 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -254,7 +254,6 @@ int charging_screen(void) #ifdef HAVE_LCD_BITMAP charging_display_info(false); #else - status_set_playmode(STATUS_STOP); lcd_puts(0, 1, "[charging]"); #endif |