summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-06-27 01:35:33 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-06-27 01:35:33 +0000
commit736a19266d2e3fb51751b86c9b84d10dc567ecd5 (patch)
tree16444a0680af68b2b8ea0321683776cea17c1ee9 /apps
parent32e27d93e883384cffb846998119ecdfd9b8fed7 (diff)
downloadrockbox-736a19266d2e3fb51751b86c9b84d10dc567ecd5.tar.gz
rockbox-736a19266d2e3fb51751b86c9b84d10dc567ecd5.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/recorder/radio.c5
-rw-r--r--apps/recorder/recording.c7
-rw-r--r--apps/screens.c1
3 files changed, 0 insertions, 13 deletions
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)
171 mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost); 171 mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost);
172 mpeg_sound_set(SOUND_AVC, global_settings.avc); 172 mpeg_sound_set(SOUND_AVC, global_settings.avc);
173 173
174 status_set_playmode(STATUS_STOP);
175
176 /* Yes, we use the D/A for monitoring */ 174 /* Yes, we use the D/A for monitoring */
177 peak_meter_playback(true); 175 peak_meter_playback(true);
178 176
@@ -241,7 +239,6 @@ bool radio_screen(void)
241 if(mpeg_status() == MPEG_STATUS_RECORD) 239 if(mpeg_status() == MPEG_STATUS_RECORD)
242 { 240 {
243 mpeg_stop(); 241 mpeg_stop();
244 status_set_playmode(STATUS_STOP);
245 } 242 }
246 else 243 else
247 { 244 {
@@ -262,7 +259,6 @@ bool radio_screen(void)
262 have_recorded = true; 259 have_recorded = true;
263 talk_buffer_steal(); /* we use the mp3 buffer */ 260 talk_buffer_steal(); /* we use the mp3 buffer */
264 mpeg_record(rec_create_filename(buf)); 261 mpeg_record(rec_create_filename(buf));
265 status_set_playmode(STATUS_RECORD);
266 update_screen = true; 262 update_screen = true;
267 } 263 }
268 last_seconds = 0; 264 last_seconds = 0;
@@ -462,7 +458,6 @@ bool radio_screen(void)
462 458
463 if(mpeg_status() & MPEG_STATUS_ERROR) 459 if(mpeg_status() & MPEG_STATUS_ERROR)
464 { 460 {
465 status_set_playmode(STATUS_STOP);
466 splash(0, true, str(LANG_DISK_FULL)); 461 splash(0, true, str(LANG_DISK_FULL));
467 status_draw(true); 462 status_draw(true);
468 lcd_update(); 463 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)
188 188
189 mpeg_sound_set(SOUND_VOLUME, global_settings.volume); 189 mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
190 190
191 status_set_playmode(STATUS_STOP);
192
193 /* Yes, we use the D/A for monitoring */ 191 /* Yes, we use the D/A for monitoring */
194 peak_meter_playback(true); 192 peak_meter_playback(true);
195 193
@@ -248,7 +246,6 @@ bool recording_screen(void)
248 if(mpeg_status() & MPEG_STATUS_RECORD) 246 if(mpeg_status() & MPEG_STATUS_RECORD)
249 { 247 {
250 mpeg_stop(); 248 mpeg_stop();
251 status_set_playmode(STATUS_STOP);
252 } 249 }
253 else 250 else
254 { 251 {
@@ -266,7 +263,6 @@ bool recording_screen(void)
266 have_recorded = true; 263 have_recorded = true;
267 talk_buffer_steal(); /* we use the mp3 buffer */ 264 talk_buffer_steal(); /* we use the mp3 buffer */
268 mpeg_record(rec_create_filename(path_buffer)); 265 mpeg_record(rec_create_filename(path_buffer));
269 status_set_playmode(STATUS_RECORD);
270 update_countdown = 1; /* Update immediately */ 266 update_countdown = 1; /* Update immediately */
271 last_seconds = 0; 267 last_seconds = 0;
272 } 268 }
@@ -275,12 +271,10 @@ bool recording_screen(void)
275 if(mpeg_status() & MPEG_STATUS_PAUSE) 271 if(mpeg_status() & MPEG_STATUS_PAUSE)
276 { 272 {
277 mpeg_resume_recording(); 273 mpeg_resume_recording();
278 status_set_playmode(STATUS_RECORD);
279 } 274 }
280 else 275 else
281 { 276 {
282 mpeg_pause_recording(); 277 mpeg_pause_recording();
283 status_set_playmode(STATUS_RECORD_PAUSE);
284 } 278 }
285 update_countdown = 1; /* Update immediately */ 279 update_countdown = 1; /* Update immediately */
286 } 280 }
@@ -595,7 +589,6 @@ bool recording_screen(void)
595 } 589 }
596 if(mpeg_status() & MPEG_STATUS_ERROR) 590 if(mpeg_status() & MPEG_STATUS_ERROR)
597 { 591 {
598 status_set_playmode(STATUS_STOP);
599 splash(0, true, str(LANG_DISK_FULL)); 592 splash(0, true, str(LANG_DISK_FULL));
600 status_draw(true); 593 status_draw(true);
601 lcd_update(); 594 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)
254#ifdef HAVE_LCD_BITMAP 254#ifdef HAVE_LCD_BITMAP
255 charging_display_info(false); 255 charging_display_info(false);
256#else 256#else
257 status_set_playmode(STATUS_STOP);
258 lcd_puts(0, 1, "[charging]"); 257 lcd_puts(0, 1, "[charging]");
259#endif 258#endif
260 259