Reworked backdrop handling. Fixes a bug that wasn't in the tracker yet ;)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9970 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 67 insertions, 12 deletions

diff --git a/apps/recorder/backdrop.c b/apps/recorder/backdrop.c
index 6fc5e24..d230a6e 100644
--- a/apps/recorder/backdrop.c
+++ b/apps/recorder/backdrop.c
@@ -21,25 +21,74 @@
 #include "config.h"
 #include "lcd.h"
 #include "backdrop.h"
+#include "splash.h" /* debugging */
 
 fb_data main_backdrop[LCD_HEIGHT][LCD_WIDTH];
 fb_data wps_backdrop[LCD_HEIGHT][LCD_WIDTH];
+bool main_backdrop_valid = false;
+bool wps_backdrop_valid = false;
 
-bool load_main_backdrop(char* filename)
+/* load a backdrop into a buffer */
+bool load_backdrop(char* filename, fb_data* backdrop_buffer)
 {
     struct bitmap bm;
     int ret;
 
     /* load the image */
-    bm.data=(char*)&main_backdrop[0][0];
+    bm.data=(char*)backdrop_buffer;
     ret = read_bmp_file(filename, &bm, sizeof(main_backdrop), FORMAT_NATIVE);
 
-    if ((ret > 0) && (bm.width == LCD_WIDTH) 
-                  && (bm.height == LCD_HEIGHT)) {
-        lcd_set_backdrop(&main_backdrop[0][0]);
+    if ((ret > 0) && (bm.width == LCD_WIDTH) && (bm.height == LCD_HEIGHT))
+    {
         return true;
-    } else {
-        lcd_set_backdrop(NULL);
+    }
+    else
+    {
         return false;
     }
 }
+
+bool load_main_backdrop(char* filename)
+{
+    main_backdrop_valid = load_backdrop(filename, &main_backdrop[0][0]);
+/*    gui_syncsplash(100, true, "MAIN backdrop load: %s", main_backdrop_valid ? "OK" : "FAIL");*/
+    return main_backdrop_valid;
+}
+
+bool load_wps_backdrop(char* filename)
+{
+    wps_backdrop_valid = load_backdrop(filename, &wps_backdrop[0][0]);
+/*    gui_syncsplash(100, true, "WPS backdrop load: %s", main_backdrop_valid ? "OK" : "FAIL");*/
+    return wps_backdrop_valid;
+}
+
+void unload_main_backdrop(void)
+{
+    main_backdrop_valid = false;
+/*    gui_syncsplash(100, true, "MAIN backdrop unload");*/
+}
+
+void unload_wps_backdrop(void)
+{
+    wps_backdrop_valid = false;
+/*    gui_syncsplash(100, true, "WPS backdrop unload");*/
+}
+
+void show_main_backdrop(void)
+{
+    lcd_set_backdrop(main_backdrop_valid ? &main_backdrop[0][0] : NULL);
+}
+
+void show_wps_backdrop(void)
+{
+    /* if no wps backdrop, fall back to main backdrop */
+    if(wps_backdrop_valid)
+    {
+        lcd_set_backdrop(&wps_backdrop[0][0]);
+    }
+    else
+    {
+/*        gui_syncsplash(100, true, "WPS backdrop show: fallback to MAIN");*/
+        show_main_backdrop();
+    }
+}
diff --git a/apps/recorder/backdrop.h b/apps/recorder/backdrop.h
index d77985c..da515af 100644
--- a/apps/recorder/backdrop.h
+++ b/apps/recorder/backdrop.h
@@ -25,14 +25,20 @@
 #include "lcd.h"
 #include "bmp.h"
 #include "backdrop.h"
-
-#ifdef HAVE_LCD_COLOR
+/*
 extern fb_data main_backdrop[LCD_HEIGHT][LCD_WIDTH];
 extern fb_data wps_backdrop[LCD_HEIGHT][LCD_WIDTH];
-#endif
+*/
 
 bool load_main_backdrop(char* filename);
+bool load_wps_backdrop(char* filename);
+
+void unload_main_backdrop(void);
+void unload_wps_backdrop(void);
+
+void show_main_backdrop(void);
+void show_wps_backdrop(void);
 
-#endif
+#endif /* HAVE_LCD_COLOR */
 
-#endif
+#endif /* _BACKDROP_H */