diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-02-07 02:48:19 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-02-07 02:48:19 +0000 |
commit | ff3bb3aa18e71860d644a50632088ec282968de4 (patch) | |
tree | 8cd33aa24b5db5684cceeffd4c3cbca2dd7d54ea /apps/gui | |
parent | 70ebc8feb156613d586b3330d309ec72d1e30c2d (diff) | |
download | rockbox-ff3bb3aa18e71860d644a50632088ec282968de4.tar.gz rockbox-ff3bb3aa18e71860d644a50632088ec282968de4.zip |
Don't save the in-out state of the recording screen as a setting. Fixes the statusbar icons if settings were saved while recording screen was on. Humbly may I suggest a global_state structure to do all this state checking more efficiently\? Ignore me if that's being worked on by someone.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12221 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/statusbar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 2f6dfafc81..d3f4813e37 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include "statusbar.h" | 38 | #include "statusbar.h" |
39 | #ifdef HAVE_RECORDING | 39 | #ifdef HAVE_RECORDING |
40 | #include "audio.h" | 40 | #include "audio.h" |
41 | #include "recording.h" | ||
41 | #endif | 42 | #endif |
42 | 43 | ||
43 | /* FIXME: should be removed from icon.h to avoid redefinition, | 44 | /* FIXME: should be removed from icon.h to avoid redefinition, |
@@ -257,7 +258,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
257 | #endif | 258 | #endif |
258 | #ifdef HAVE_RECORDING | 259 | #ifdef HAVE_RECORDING |
259 | /* turn off volume display in recording screen */ | 260 | /* turn off volume display in recording screen */ |
260 | if (!global_settings.recscreen_on) | 261 | bool recscreen_on = in_recording_screen(); |
262 | if (!recscreen_on) | ||
261 | #endif | 263 | #endif |
262 | bar->redraw_volume = gui_statusbar_icon_volume(bar, bar->info.volume); | 264 | bar->redraw_volume = gui_statusbar_icon_volume(bar, bar->info.volume); |
263 | gui_statusbar_icon_play_state(display, current_playmode() + Icon_Play); | 265 | gui_statusbar_icon_play_state(display, current_playmode() + Icon_Play); |
@@ -265,7 +267,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
265 | #ifdef HAVE_RECORDING | 267 | #ifdef HAVE_RECORDING |
266 | /* If in recording screen, replace repeat mode, volume | 268 | /* If in recording screen, replace repeat mode, volume |
267 | and shuffle icons with recording info */ | 269 | and shuffle icons with recording info */ |
268 | if (global_settings.recscreen_on) | 270 | if (recscreen_on) |
269 | gui_statusbar_icon_recording_info(display); | 271 | gui_statusbar_icon_recording_info(display); |
270 | else | 272 | else |
271 | #endif | 273 | #endif |