diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2009-08-24 00:03:59 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2009-08-24 00:03:59 +0000 |
| commit | 5850207d332f78d4fcf4a7ec22ae8b95b921a183 (patch) | |
| tree | 3a2be4c63c11c69b1a1fae5d0a5008bf217677c1 /apps/gui/statusbar.c | |
| parent | 19f44a61cfb333c363d823e43b5de282ef2d2ed0 (diff) | |
| download | rockbox-5850207d332f78d4fcf4a7ec22ae8b95b921a183.zip rockbox-5850207d332f78d4fcf4a7ec22ae8b95b921a183.tar.gz rockbox-5850207d332f78d4fcf4a7ec22ae8b95b921a183.tar.bz2 rockbox-5850207d332f78d4fcf4a7ec22ae8b95b921a183.tar.xz | |
Slightly change parts of the previous commit to reuse existing code, and enforce enum statusbar_values instead of just int,
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22485 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/statusbar.c')
| -rw-r--r-- | apps/gui/statusbar.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 1a72440..7a361e5 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c @@ -827,13 +827,7 @@ void gui_statusbar_changed( enum screen_type screen, enum statusbar_values old) { /* clear and update the statusbar area to remove old parts */ - enum statusbar_values bar; -#ifdef HAVE_REMOTE_LCD - if (screen == SCREEN_REMOTE) - bar = global_settings.remote_statusbar; - else -#endif - bar = global_settings.statusbar; + enum statusbar_values bar = statusbar_position(screen); struct screen *display = &screens[screen]; struct viewport vp; @@ -850,7 +844,7 @@ void gui_statusbar_changed( enum screen_type screen, #endif #ifdef HAVE_REMOTE_LCD -int statusbar_position(int screen) +enum statusbar_values statusbar_position(int screen) { if (screen == SCREEN_REMOTE) return global_settings.remote_statusbar; |