summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-10-09 19:17:22 +0000
committerThomas Martitz <kugel@rockbox.org>2009-10-09 19:17:22 +0000
commit8e3e5e7a59f741c16eafc5ff0672af2eb1404835 (patch)
tree5dbfa1de6d84e1153a24f9c53dad800cf2ea9aec
parentdcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10 (diff)
downloadrockbox-8e3e5e7a59f741c16eafc5ff0672af2eb1404835.tar.gz
rockbox-8e3e5e7a59f741c16eafc5ff0672af2eb1404835.tar.bz2
rockbox-8e3e5e7a59f741c16eafc5ff0672af2eb1404835.zip
Fix player red and remove an obsolete function call.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23056 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/viewport.c2
-rw-r--r--apps/gui/viewport.h6
-rw-r--r--apps/language.c3
-rw-r--r--apps/settings.c2
4 files changed, 5 insertions, 8 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index e12157530f..d91aa42762 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -60,9 +60,9 @@
#endif
static int statusbar_enabled = 0;
-static void viewport_rtl_handler(struct viewport *vp);
#ifdef HAVE_LCD_BITMAP
+static void viewport_rtl_handler(struct viewport *vp);
static struct {
struct viewport* vp;
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h
index 9ab0a71439..463de2b333 100644
--- a/apps/gui/viewport.h
+++ b/apps/gui/viewport.h
@@ -76,8 +76,6 @@ void viewportmanager_init(void);
int viewportmanager_get_statusbar(void);
int viewportmanager_set_statusbar(int enabled);
-/* call this when a theme changed */
-void viewportmanager_theme_changed(int);
/*
* Initializes the given viewport with maximum dimensions minus status- and
@@ -87,6 +85,9 @@ void viewport_set_fullscreen(struct viewport *vp, enum screen_type screen);
#ifdef HAVE_LCD_BITMAP
+/* call this when a theme changed */
+void viewportmanager_theme_changed(int);
+
/*
* Returns a pointer to the current viewport
* - That could be the UI vp, or a viewport passed to do_menu() or the like
@@ -111,6 +112,7 @@ bool viewport_point_within_vp(const struct viewport *vp, int x, int y);
#else /* HAVE_LCD_CHARCELL */
#define viewport_set_current_vp(a)
#define viewport_get_current_vp() NULL
+#define viewportmanager_theme_changed(a)
#endif
#endif /* __PCTOOL__ */
diff --git a/apps/language.c b/apps/language.c
index 0737a481be..fef8cd0a04 100644
--- a/apps/language.c
+++ b/apps/language.c
@@ -116,9 +116,6 @@ int lang_load(const char *filename)
else
{
lang_options = lang_header[3];
-#ifdef HAVE_LCD_BITMAP
- viewportmanager_theme_changed(THEME_UI_VIEWPORT);
-#endif
}
return retcode;
}
diff --git a/apps/settings.c b/apps/settings.c
index ce1ee07054..ce888c44c5 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -997,9 +997,7 @@ void settings_apply(bool read_disk)
#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC
enc_global_settings_apply();
#endif
-#ifdef HAVE_LCD_BITMAP
viewportmanager_theme_changed(THEME_ALL);
-#endif
}