Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A simple rename in cube.c (s/USE_GSLIB/USEGSLIB) in order to have better consistency across plugins

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24280 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2010-01-18 20:53:59 +00:00
parent 16a5066573
commit 99a7cdc46c
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/plugins/cube.c
View file

@ -304,7 +304,7 @@ static int x_off = LCD_WIDTH/2;
static int y_off = LCD_HEIGHT/2; static int y_off = LCD_HEIGHT/2;
#if LCD_DEPTH == 1 #if LCD_DEPTH == 1
#define USE_GSLIB #define USEGSLIB
GREY_INFO_STRUCT GREY_INFO_STRUCT
struct my_lcd { struct my_lcd {
void (*update)(void); void (*update)(void);
@ -399,13 +399,13 @@ static const struct face faces[6] =
{{1, 5, 6, 2}, {9, 6, 10, 1}} {{1, 5, 6, 2}, {9, 6, 10, 1}}
}; };
#if LCD_DEPTH > 1 || defined(USE_GSLIB) #if LCD_DEPTH > 1 || defined(USEGSLIB)
static const unsigned face_colors[6] = static const unsigned face_colors[6] =
{ {
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(0, 255, 0),
LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(0, 0, 255), LCD_RGBPACK(0, 0, 255) LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(0, 0, 255), LCD_RGBPACK(0, 0, 255)
#elif defined(USE_GSLIB) #elif defined(USEGSLIB)
#ifdef MROBE_100 #ifdef MROBE_100
GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY, GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY,
GREY_DARKGRAY, GREY_WHITE, GREY_WHITE GREY_DARKGRAY, GREY_WHITE, GREY_WHITE
@ -421,7 +421,7 @@ static const unsigned face_colors[6] =
#endif #endif
enum { enum {
#if LCD_DEPTH > 1 || defined(USE_GSLIB) #if LCD_DEPTH > 1 || defined(USEGSLIB)
SOLID, SOLID,
#endif #endif
HIDDEN_LINES, HIDDEN_LINES,
@ -512,13 +512,13 @@ static void cube_viewport(void)
static void cube_draw(void) static void cube_draw(void)
{ {
int i, j, line; int i, j, line;
#if LCD_DEPTH > 1 || defined(USE_GSLIB) #if LCD_DEPTH > 1 || defined(USEGSLIB)
unsigned old_foreground; unsigned old_foreground;
#endif #endif
switch (mode) switch (mode)
{ {
#if LCD_DEPTH > 1 || defined(USE_GSLIB) #if LCD_DEPTH > 1 || defined(USEGSLIB)
case SOLID: case SOLID:
old_foreground = MY_GET_FOREGROUND(); old_foreground = MY_GET_FOREGROUND();
@ -596,7 +596,7 @@ void cleanup(void *parameter)
{ {
(void)parameter; (void)parameter;
#ifdef USE_GSLIB #ifdef USEGSLIB
grey_release(); grey_release();
#elif defined HAVE_LCD_CHARCELLS #elif defined HAVE_LCD_CHARCELLS
pgfx_release(); pgfx_release();
@ -607,7 +607,7 @@ enum plugin_status plugin_start(const void* parameter)
{ {
char buffer[30]; char buffer[30];
int t_disp = 0; int t_disp = 0;
#ifdef USE_GSLIB #ifdef USEGSLIB
unsigned char *gbuf; unsigned char *gbuf;
size_t gbuf_size = 0; size_t gbuf_size = 0;
bool mode_switch = true; bool mode_switch = true;
@ -624,7 +624,7 @@ enum plugin_status plugin_start(const void* parameter)
(void)(parameter); (void)(parameter);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#if defined(USE_GSLIB) #if defined(USEGSLIB)
gbuf = (unsigned char *)rb->plugin_get_buffer(&gbuf_size); gbuf = (unsigned char *)rb->plugin_get_buffer(&gbuf_size);
if (!grey_init(gbuf, gbuf_size, GREY_BUFFERED, if (!grey_init(gbuf, gbuf_size, GREY_BUFFERED,
LCD_WIDTH, LCD_HEIGHT, NULL)) LCD_WIDTH, LCD_HEIGHT, NULL))
@ -696,7 +696,7 @@ enum plugin_status plugin_start(const void* parameter)
} }
} }
#endif #endif
#ifdef USE_GSLIB #ifdef USEGSLIB
if (mode_switch) if (mode_switch)
{ {
grey_show(mode == SOLID); grey_show(mode == SOLID);
@ -783,7 +783,7 @@ enum plugin_status plugin_start(const void* parameter)
#endif #endif
if (++mode >= NUM_MODES) if (++mode >= NUM_MODES)
mode = 0; mode = 0;
#ifdef USE_GSLIB #ifdef USEGSLIB
mylcd = (mode == SOLID) ? &greyfuncs : &lcdfuncs; mylcd = (mode == SOLID) ? &greyfuncs : &lcdfuncs;
mode_switch = true; mode_switch = true;
#endif #endif
@ -824,7 +824,7 @@ enum plugin_status plugin_start(const void* parameter)
lastbutton = button; lastbutton = button;
} }
#ifdef USE_GSLIB #ifdef USEGSLIB
grey_release(); grey_release();
#elif defined(HAVE_LCD_CHARCELLS) #elif defined(HAVE_LCD_CHARCELLS)
pgfx_release(); pgfx_release();