devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Added multi-screen API to the plugins API, made 'demystify plugin' use the remote display as well

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10167 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kevin Ferrare 2006-07-01 10:14:27 +00:00
parent 4e819aa2af
commit 0028b05f3e
5 changed files with 98 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/plugin.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2002 Björn Stenberg * Copyright (C) 2002 Bj<EFBFBD>n Stenberg
* *
* All files in this archive are subject to the GNU General Public License. * All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement. * See the file COPYING in the source tree root for full license agreement.
@ -442,6 +442,12 @@ static const struct plugin_api rockbox_api = {
set_int, set_int,
reload_directory, reload_directory,
set_bool,
#if NB_SCREENS == 2
{&screens[SCREEN_MAIN], &screens[SCREEN_REMOTE]},
#else
{&screens[SCREEN_MAIN]},
#endif
}; };
int plugin_load(const char* plugin, void* parameter) int plugin_load(const char* plugin, void* parameter)

6
apps/plugin.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2002 Björn Stenberg * Copyright (C) 2002 Bj<EFBFBD>n Stenberg
* *
* All files in this archive are subject to the GNU General Public License. * All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement. * See the file COPYING in the source tree root for full license agreement.
@ -104,7 +104,7 @@
#define PLUGIN_MAGIC 0x526F634B /* RocK */ #define PLUGIN_MAGIC 0x526F634B /* RocK */
/* increase this every time the api struct changes */ /* increase this every time the api struct changes */
#define PLUGIN_API_VERSION 22 #define PLUGIN_API_VERSION 23
/* update this to latest version if a change to the api struct breaks /* update this to latest version if a change to the api struct breaks
backwards compatibility (and please take the opportunity to sort in any backwards compatibility (and please take the opportunity to sort in any
@ -521,6 +521,8 @@ struct plugin_api {
int* variable, void (*function)(int), int step, int min, int* variable, void (*function)(int), int step, int min,
int max, void (*formatter)(char*, int, int, const char*) ); int max, void (*formatter)(char*, int, int, const char*) );
void (*reload_directory)(void); void (*reload_directory)(void);
bool (*set_bool)(const char* string, bool* variable );
struct screen* screens[NB_SCREENS];
}; };
/* plugin header */ /* plugin header */

116
apps/plugins/demystify.c
View file

@ -54,6 +54,10 @@ PLUGIN_HEADER
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD) (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define DEMYSTIFY_RC_QUIT BUTTON_RC_STOP #define DEMYSTIFY_RC_QUIT BUTTON_RC_STOP
#define DEMYSTIFY_RC_ADD_POLYGON BUTTON_RC_BITRATE
#define DEMYSTIFY_RC_REMOVE_POLYGON BUTTON_RC_SOURCE
#define DEMYSTIFY_RC_INCREASE_SPEED BUTTON_RC_VOL_UP
#define DEMYSTIFY_RC_DECREASE_SPEED BUTTON_RC_VOL_DOWN
#endif #endif
#endif #endif
@ -103,13 +107,13 @@ struct polygon
/* /*
* Generates a random polygon (which fits the screen size though) * Generates a random polygon (which fits the screen size though)
*/ */
void polygon_init(struct polygon * polygon) void polygon_init(struct polygon * polygon, struct screen * display)
{ {
int i; int i;
for(i=0;i<NB_POINTS;++i) for(i=0;i<NB_POINTS;++i)
{ {
polygon->points[i].x=(rb->rand() % (LCD_WIDTH)); polygon->points[i].x=(rb->rand() % (display->width));
polygon->points[i].y=(rb->rand() % (LCD_HEIGHT)); polygon->points[i].y=(rb->rand() % (display->height));
} }
} }
@ -117,15 +121,15 @@ void polygon_init(struct polygon * polygon)
* Draw the given polygon onto the screen * Draw the given polygon onto the screen
*/ */
void polygon_draw(struct polygon * polygon) void polygon_draw(struct polygon * polygon, struct screen * display)
{ {
int i; int i;
for(i=0;i<NB_POINTS-1;++i) for(i=0;i<NB_POINTS-1;++i)
{ {
rb->lcd_drawline(polygon->points[i].x, polygon->points[i].y, display->drawline(polygon->points[i].x, polygon->points[i].y,
polygon->points[i+1].x, polygon->points[i+1].y); polygon->points[i+1].x, polygon->points[i+1].y);
} }
rb->lcd_drawline(polygon->points[0].x, polygon->points[0].y, display->drawline(polygon->points[0].x, polygon->points[0].y,
polygon->points[NB_POINTS-1].x, polygon->points[NB_POINTS-1].x,
polygon->points[NB_POINTS-1].y); polygon->points[NB_POINTS-1].y);
} }
@ -154,7 +158,7 @@ void polygon_move_init(struct polygon_move * polygon_move)
* Update the given polygon's position according to the given informations in * Update the given polygon's position according to the given informations in
* polygon_move (polygon_move may be updated) * polygon_move (polygon_move may be updated)
*/ */
void polygon_update(struct polygon *polygon, struct polygon_move *polygon_move) void polygon_update(struct polygon *polygon, struct screen * display, struct polygon_move *polygon_move)
{ {
int i, x, y, step; int i, x, y, step;
for(i=0;i<NB_POINTS;++i) for(i=0;i<NB_POINTS;++i)
@ -167,9 +171,9 @@ void polygon_update(struct polygon *polygon, struct polygon_move *polygon_move)
x=1; x=1;
polygon_move->move_steps[i].x=get_new_step(step); polygon_move->move_steps[i].x=get_new_step(step);
} }
else if(x>=LCD_WIDTH) else if(x>=display->width)
{ {
x=LCD_WIDTH-1; x=display->width-1;
polygon_move->move_steps[i].x=get_new_step(step); polygon_move->move_steps[i].x=get_new_step(step);
} }
polygon->points[i].x=x; polygon->points[i].x=x;
@ -182,9 +186,9 @@ void polygon_update(struct polygon *polygon, struct polygon_move *polygon_move)
y=1; y=1;
polygon_move->move_steps[i].y=get_new_step(step); polygon_move->move_steps[i].y=get_new_step(step);
} }
else if(y>=LCD_HEIGHT) else if(y>=display->height)
{ {
y=LCD_HEIGHT-1; y=display->height-1;
polygon_move->move_steps[i].y=get_new_step(step); polygon_move->move_steps[i].y=get_new_step(step);
} }
polygon->points[i].y=y; polygon->points[i].y=y;
@ -243,30 +247,25 @@ struct polygon * fifo_pop(struct polygon_fifo * fifo)
* Drawing stuffs * Drawing stuffs
*/ */
void polygons_draw(struct polygon_fifo * polygons) void polygons_draw(struct polygon_fifo * polygons, struct screen * display)
{ {
int i, j; int i, j;
for(i=0, j=polygons->fifo_tail;i<polygons->nb_items;++i, ++j) for(i=0, j=polygons->fifo_tail;i<polygons->nb_items;++i, ++j)
{ {
if(j>=MAX_POLYGONS) if(j>=MAX_POLYGONS)
j=0; j=0;
polygon_draw(&(polygons->tab[j])); polygon_draw(&(polygons->tab[j]), display);
} }
} }
static struct polygon_fifo polygons;
static struct polygon_move move; /* This describes the movement of the leading
polygon, the others just follow */
static struct polygon leading_polygon;
void cleanup(void *parameter) void cleanup(void *parameter)
{ {
(void)parameter; (void)parameter;
rb->backlight_set_timeout(rb->global_settings->backlight_timeout); rb->screens[SCREEN_MAIN]->backlight_set_timeout(rb->global_settings->backlight_timeout);
#if NB_SCREENS==2
rb->screens[SCREEN_REMOTE]->backlight_set_timeout(rb->global_settings->remote_backlight_timeout);
#endif
} }
/* /*
@ -278,37 +277,46 @@ int plugin_main(void)
int button; int button;
int sleep_time=DEFAULT_WAIT_TIME; int sleep_time=DEFAULT_WAIT_TIME;
int nb_wanted_polygons=DEFAULT_NB_POLYGONS; int nb_wanted_polygons=DEFAULT_NB_POLYGONS;
int i;
fifo_init(&polygons); struct polygon_fifo polygons[NB_SCREENS];
polygon_move_init(&move); struct polygon_move move[NB_SCREENS]; /* This describes the movement of the leading
polygon_init(&leading_polygon); polygon, the others just follow */
struct polygon leading_polygon[NB_SCREENS];
FOR_NB_SCREENS(i)
{
fifo_init(&polygons[i]);
polygon_move_init(&move[i]);
polygon_init(&leading_polygon[i], rb->screens[i]);
}
while (true) while (true)
{ {
if(polygons.nb_items>nb_wanted_polygons) FOR_NB_SCREENS(i)
{
struct screen * display=rb->screens[i];
if(polygons[i].nb_items>nb_wanted_polygons)
{ /* We have too many polygons, we must drop some of them */ { /* We have too many polygons, we must drop some of them */
fifo_pop(&polygons); fifo_pop(&polygons[i]);
} }
if(nb_wanted_polygons==polygons.nb_items) if(nb_wanted_polygons==polygons[i].nb_items)
{ /* We have the good number of polygons, we can safely drop the last { /* We have the good number of polygons, we can safely drop
one to add the new one later */ the last one to add the new one later */
fifo_pop(&polygons); fifo_pop(&polygons[i]);
} }
fifo_push(&polygons, &leading_polygon); fifo_push(&polygons[i], &leading_polygon[i]);
/* /*
* Then we update the leading polygon for the next round acording to * Then we update the leading polygon for the next round acording to
* current move (the move may be altered in case of sreen border * current move (the move may be altered in case of sreen border
* collision) * collision)
*/ */
polygon_update(&leading_polygon, &move); polygon_update(&leading_polygon[i], display, &move[i]);
/* Now the drawing part */ /* Now the drawing part */
rb->lcd_clear_display(); display->clear_display();
polygons_draw(&polygons); polygons_draw(&polygons[i], display);
rb->lcd_update(); display->update();
}
/* Speed handling*/ /* Speed handling*/
if (sleep_time<0)/* full speed */ if (sleep_time<0)/* full speed */
rb->yield(); rb->yield();
@ -322,26 +330,37 @@ int plugin_main(void)
#ifdef DEMYSTIFY_RC_QUIT #ifdef DEMYSTIFY_RC_QUIT
case DEMYSTIFY_RC_QUIT : case DEMYSTIFY_RC_QUIT :
#endif #endif
case (DEMYSTIFY_QUIT): case DEMYSTIFY_QUIT:
cleanup(NULL); cleanup(NULL);
return PLUGIN_OK; return PLUGIN_OK;
#ifdef DEMYSTIFY_RC_ADD_POLYGON
case (DEMYSTIFY_ADD_POLYGON): case DEMYSTIFY_RC_ADD_POLYGON:
#endif
case DEMYSTIFY_ADD_POLYGON:
if(nb_wanted_polygons<MAX_POLYGONS) if(nb_wanted_polygons<MAX_POLYGONS)
++nb_wanted_polygons; ++nb_wanted_polygons;
break; break;
case (DEMYSTIFY_REMOVE_POLYGON): #ifdef DEMYSTIFY_RC_REMOVE_POLYGON
case DEMYSTIFY_RC_REMOVE_POLYGON:
#endif
case DEMYSTIFY_REMOVE_POLYGON:
if(nb_wanted_polygons>MIN_POLYGONS) if(nb_wanted_polygons>MIN_POLYGONS)
--nb_wanted_polygons; --nb_wanted_polygons;
break; break;
case (DEMYSTIFY_INCREASE_SPEED): #ifdef DEMYSTIFY_RC_INCREASE_SPEED
case DEMYSTIFY_RC_INCREASE_SPEED:
#endif
case DEMYSTIFY_INCREASE_SPEED:
if(sleep_time>=0) if(sleep_time>=0)
--sleep_time; --sleep_time;
break; break;
case (DEMYSTIFY_DECREASE_SPEED): #ifdef DEMYSTIFY_RC_DECREASE_SPEED
case DEMYSTIFY_RC_DECREASE_SPEED:
#endif
case DEMYSTIFY_DECREASE_SPEED:
++sleep_time; ++sleep_time;
break; break;
@ -363,8 +382,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; /* copy to global api pointer */ rb = api; /* copy to global api pointer */
(void)parameter; (void)parameter;
if (rb->global_settings->backlight_timeout > 0) if (rb->global_settings->backlight_timeout > 0)
rb->backlight_set_timeout(1);/* keep the light on */ {
int i;
FOR_NB_SCREENS(i)
rb->screens[i]->backlight_set_timeout(1);/* keep the light on */
}
ret = plugin_main(); ret = plugin_main();
return ret; return ret;

4
apps/screen_access.c
View file

@ -100,6 +100,8 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
screen->puts=&lcd_remote_puts; screen->puts=&lcd_remote_puts;
screen->backlight_on=&remote_backlight_on; screen->backlight_on=&remote_backlight_on;
screen->backlight_off=&remote_backlight_off; screen->backlight_off=&remote_backlight_off;
screen->is_backlight_on=&is_remote_backlight_on;
screen->backlight_set_timeout=&remote_backlight_set_timeout;
break; break;
#endif /* HAVE_REMOTE_LCD */ #endif /* HAVE_REMOTE_LCD */
@ -182,6 +184,8 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
screen->puts=&lcd_puts; screen->puts=&lcd_puts;
screen->backlight_on=&backlight_on; screen->backlight_on=&backlight_on;
screen->backlight_off=&backlight_off; screen->backlight_off=&backlight_off;
screen->is_backlight_on=&is_backlight_on;
screen->backlight_set_timeout=&backlight_set_timeout;
break; break;
} }
screen->screen_type=screen_type; screen->screen_type=screen_type;

2
apps/screen_access.h
View file

@ -127,6 +127,8 @@ struct screen
#endif #endif
void (*backlight_on)(void); void (*backlight_on)(void);
void (*backlight_off)(void); void (*backlight_off)(void);
bool (*is_backlight_on)(void);
void (*backlight_set_timeout)(int index);
void (*puts)(int x, int y, const unsigned char *str); void (*puts)(int x, int y, const unsigned char *str);
}; };