From 736a19266d2e3fb51751b86c9b84d10dc567ecd5 Mon Sep 17 00:00:00 2001
From: Linus Nielsen Feltzing <linus@haxx.se>
Date: Sun, 27 Jun 2004 01:35:33 +0000
Subject: 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
---
 apps/recorder/radio.c     | 5 -----
 apps/recorder/recording.c | 7 -------
 apps/screens.c            | 1 -
 3 files changed, 13 deletions(-)

(limited to 'apps')

diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index feea3fa5f2..d6a0b82cc9 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 86b4a46a52..40c416971a 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 a5b9f90796..873f4cd854 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
     
-- 
cgit v1.2.3