diff options
author | Dave Chapman <dave@dchapman.com> | 2006-03-28 16:04:11 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-03-28 16:04:11 +0000 |
commit | 39876971a84c91748d8e7102acae5a3de5949c9b (patch) | |
tree | a4dc18790383c613f8dd2c603d407759aa6c523f | |
parent | 47f4a458d636a889e955e68f896708f1276febc0 (diff) | |
download | rockbox-39876971a84c91748d8e7102acae5a3de5949c9b.tar.gz rockbox-39876971a84c91748d8e7102acae5a3de5949c9b.zip |
Do not export load_main_backdrop() via the plugin API. Plugins should allocate their own buffer and use lcd_set_backdrop()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9313 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugin.c | 1 | ||||
-rw-r--r-- | apps/plugin.h | 1 | ||||
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 1 | ||||
-rw-r--r-- | apps/plugins/doom/rockmacros.h | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index b18ccb0626..fdced30d17 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -414,7 +414,6 @@ static const struct plugin_api rockbox_api = { | |||
414 | 414 | ||
415 | vsnprintf, | 415 | vsnprintf, |
416 | memchr, | 416 | memchr, |
417 | load_main_backdrop | ||
418 | }; | 417 | }; |
419 | 418 | ||
420 | int plugin_load(const char* plugin, void* parameter) | 419 | int plugin_load(const char* plugin, void* parameter) |
diff --git a/apps/plugin.h b/apps/plugin.h index f9cca6ffc3..4061346eba 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -483,7 +483,6 @@ struct plugin_api { | |||
483 | 483 | ||
484 | int (*vsnprintf)(char *buf, int size, const char *fmt, va_list ap); | 484 | int (*vsnprintf)(char *buf, int size, const char *fmt, va_list ap); |
485 | void *(*memchr)(const void *s1, int c, size_t n); | 485 | void *(*memchr)(const void *s1, int c, size_t n); |
486 | bool (*load_main_backdrop)(char* filename); | ||
487 | }; | 486 | }; |
488 | 487 | ||
489 | /* plugin header */ | 488 | /* plugin header */ |
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index ae994c1acd..315adb34e0 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -642,6 +642,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
642 | rb->lcd_setfont(0); | 642 | rb->lcd_setfont(0); |
643 | 643 | ||
644 | #ifdef FANCY_MENU | 644 | #ifdef FANCY_MENU |
645 | /* TO FIX: Don't use load_main_backdrop() - use lcd_set_backdrop() */ | ||
645 | if(rb->load_main_backdrop(GAMEBASE"backdrop.bmp")) | 646 | if(rb->load_main_backdrop(GAMEBASE"backdrop.bmp")) |
646 | rb->lcd_set_foreground(LCD_RGBPACK(85,208,56)); | 647 | rb->lcd_set_foreground(LCD_RGBPACK(85,208,56)); |
647 | 648 | ||
diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h index 6caeb2aa8a..e428331de8 100644 --- a/apps/plugins/doom/rockmacros.h +++ b/apps/plugins/doom/rockmacros.h | |||
@@ -89,5 +89,5 @@ inline void* memcpy(void* dst, const void* src, size_t size); | |||
89 | //#define SIMPLECHECKS | 89 | //#define SIMPLECHECKS |
90 | #define NO_PREDEFINED_LUMPS | 90 | #define NO_PREDEFINED_LUMPS |
91 | #define TABLES_AS_LUMPS // This frees up alot of space in the plugin buffer | 91 | #define TABLES_AS_LUMPS // This frees up alot of space in the plugin buffer |
92 | #define FANCY_MENU // This is a call to allow load_main_backdrop to run in doom | 92 | //#define FANCY_MENU // This is a call to allow load_main_backdrop to run in doom |
93 | #endif | 93 | #endif |