diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2010-01-21 12:27:07 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2010-01-21 12:27:07 +0000 |
commit | e0dfa22cad7dd22e7ab7ac8d0fa2df21e4cedddb (patch) | |
tree | 372f9625b1498ccd28f575271969a17ef6b252b9 /apps | |
parent | 7ebde8503b9923c97920a4a25c47c1dfd7edc69f (diff) | |
download | rockbox-e0dfa22cad7dd22e7ab7ac8d0fa2df21e4cedddb.tar.gz rockbox-e0dfa22cad7dd22e7ab7ac8d0fa2df21e4cedddb.zip |
Fractals: this should fix bugs on simulator for greyscale LCD targets.
* moved #define USEGSLIB to fractal_sets.h and include only needed header file.
* include plugin.h so that LCD_DEPTH is defined.
* explicitly include fractal_sets.h in mandelbrot_set.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24309 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/fractals/fractal.h | 4 | ||||
-rw-r--r-- | apps/plugins/fractals/fractal_sets.h | 6 | ||||
-rw-r--r-- | apps/plugins/fractals/mandelbrot_set.c | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 6c0af2298a..cac0df48c4 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -21,10 +21,6 @@ | |||
21 | #ifndef _FRACTAL_H | 21 | #ifndef _FRACTAL_H |
22 | #define _FRACTAL_H | 22 | #define _FRACTAL_H |
23 | 23 | ||
24 | #if (LCD_DEPTH < 8) | ||
25 | #define USEGSLIB | ||
26 | #endif | ||
27 | |||
28 | /* variable button definitions */ | 24 | /* variable button definitions */ |
29 | #if CONFIG_KEYPAD == RECORDER_PAD | 25 | #if CONFIG_KEYPAD == RECORDER_PAD |
30 | #define FRACTAL_QUIT BUTTON_OFF | 26 | #define FRACTAL_QUIT BUTTON_OFF |
diff --git a/apps/plugins/fractals/fractal_sets.h b/apps/plugins/fractals/fractal_sets.h index 3b5e3c7856..b2eaa589dc 100644 --- a/apps/plugins/fractals/fractal_sets.h +++ b/apps/plugins/fractals/fractal_sets.h | |||
@@ -21,8 +21,14 @@ | |||
21 | #ifndef _FRACTAL_SETS_H | 21 | #ifndef _FRACTAL_SETS_H |
22 | #define _FRACTAL_SETS_H | 22 | #define _FRACTAL_SETS_H |
23 | 23 | ||
24 | #include "plugin.h" | ||
25 | |||
26 | #if (LCD_DEPTH < 8) | ||
27 | #define USEGSLIB | ||
24 | #include "lib/grey.h" | 28 | #include "lib/grey.h" |
29 | #else | ||
25 | #include "lib/xlcd.h" | 30 | #include "lib/xlcd.h" |
31 | #endif | ||
26 | 32 | ||
27 | #define DELTA 8 /* Panning moves 1/DELTA of screen */ | 33 | #define DELTA 8 /* Panning moves 1/DELTA of screen */ |
28 | 34 | ||
diff --git a/apps/plugins/fractals/mandelbrot_set.c b/apps/plugins/fractals/mandelbrot_set.c index 013b462454..85f1b4ba75 100644 --- a/apps/plugins/fractals/mandelbrot_set.c +++ b/apps/plugins/fractals/mandelbrot_set.c | |||
@@ -20,6 +20,7 @@ | |||
20 | * KIND, either express or implied. | 20 | * KIND, either express or implied. |
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #include "fractal_sets.h" | ||
23 | #include "mandelbrot_set.h" | 24 | #include "mandelbrot_set.h" |
24 | 25 | ||
25 | #define BUTTON_YIELD_TIMEOUT (HZ / 4) | 26 | #define BUTTON_YIELD_TIMEOUT (HZ / 4) |