diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-10-09 19:17:22 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-09 19:17:22 +0000 |
commit | 8e3e5e7a59f741c16eafc5ff0672af2eb1404835 (patch) | |
tree | 5dbfa1de6d84e1153a24f9c53dad800cf2ea9aec /apps | |
parent | dcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10 (diff) | |
download | rockbox-8e3e5e7a59f741c16eafc5ff0672af2eb1404835.tar.gz 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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/viewport.c | 2 | ||||
-rw-r--r-- | apps/gui/viewport.h | 6 | ||||
-rw-r--r-- | apps/language.c | 3 | ||||
-rw-r--r-- | apps/settings.c | 2 |
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 @@ | |||
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | static int statusbar_enabled = 0; | 62 | static int statusbar_enabled = 0; |
63 | static void viewport_rtl_handler(struct viewport *vp); | ||
64 | 63 | ||
65 | #ifdef HAVE_LCD_BITMAP | 64 | #ifdef HAVE_LCD_BITMAP |
65 | static void viewport_rtl_handler(struct viewport *vp); | ||
66 | 66 | ||
67 | static struct { | 67 | static struct { |
68 | struct viewport* vp; | 68 | 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); | |||
76 | int viewportmanager_get_statusbar(void); | 76 | int viewportmanager_get_statusbar(void); |
77 | int viewportmanager_set_statusbar(int enabled); | 77 | int viewportmanager_set_statusbar(int enabled); |
78 | 78 | ||
79 | /* call this when a theme changed */ | ||
80 | void viewportmanager_theme_changed(int); | ||
81 | 79 | ||
82 | /* | 80 | /* |
83 | * Initializes the given viewport with maximum dimensions minus status- and | 81 | * 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); | |||
87 | 85 | ||
88 | #ifdef HAVE_LCD_BITMAP | 86 | #ifdef HAVE_LCD_BITMAP |
89 | 87 | ||
88 | /* call this when a theme changed */ | ||
89 | void viewportmanager_theme_changed(int); | ||
90 | |||
90 | /* | 91 | /* |
91 | * Returns a pointer to the current viewport | 92 | * Returns a pointer to the current viewport |
92 | * - That could be the UI vp, or a viewport passed to do_menu() or the like | 93 | * - 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); | |||
111 | #else /* HAVE_LCD_CHARCELL */ | 112 | #else /* HAVE_LCD_CHARCELL */ |
112 | #define viewport_set_current_vp(a) | 113 | #define viewport_set_current_vp(a) |
113 | #define viewport_get_current_vp() NULL | 114 | #define viewport_get_current_vp() NULL |
115 | #define viewportmanager_theme_changed(a) | ||
114 | #endif | 116 | #endif |
115 | 117 | ||
116 | #endif /* __PCTOOL__ */ | 118 | #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) | |||
116 | else | 116 | else |
117 | { | 117 | { |
118 | lang_options = lang_header[3]; | 118 | lang_options = lang_header[3]; |
119 | #ifdef HAVE_LCD_BITMAP | ||
120 | viewportmanager_theme_changed(THEME_UI_VIEWPORT); | ||
121 | #endif | ||
122 | } | 119 | } |
123 | return retcode; | 120 | return retcode; |
124 | } | 121 | } |
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) | |||
997 | #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC | 997 | #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC |
998 | enc_global_settings_apply(); | 998 | enc_global_settings_apply(); |
999 | #endif | 999 | #endif |
1000 | #ifdef HAVE_LCD_BITMAP | ||
1001 | viewportmanager_theme_changed(THEME_ALL); | 1000 | viewportmanager_theme_changed(THEME_ALL); |
1002 | #endif | ||
1003 | } | 1001 | } |
1004 | 1002 | ||
1005 | 1003 | ||