len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

'no voice' is -1 not 0 and menu_items does have a pointer

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10527 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcoen Hirschberg 2006-08-11 12:48:36 +00:00
parent ed70da26bd
commit d24ed9987b
5 changed files with 205 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/plugins/jpeg.c
View file

@ -2097,22 +2097,22 @@ int show_menu(void) /* return 1 to quit */
{ "Return", NULL }, { "Return", NULL },
}; };
static const struct opt_items slideshow[2] = { static const struct opt_items slideshow[2] = {
{"Disable",0}, { "Disable", -1 },
{"Enable",0}, { "Enable", -1 },
}; };
static const struct opt_items timeout[12] = { static const struct opt_items timeout[12] = {
{ "1 second", 0 }, { "1 second", -1 },
{ "2 seconds", 0 }, { "2 seconds", -1 },
{ "3 seconds", 0 }, { "3 seconds", -1 },
{ "4 seconds", 0 }, { "4 seconds", -1 },
{ "5 seconds", 0 }, { "5 seconds", -1 },
{ "6 seconds", 0 }, { "6 seconds", -1 },
{ "7 seconds", 0 }, { "7 seconds", -1 },
{ "8 seconds", 0 }, { "8 seconds", -1 },
{ "9 seconds", 0 }, { "9 seconds", -1 },
{ "10 seconds", 0 }, { "10 seconds", -1 },
{ "15 seconds", 0 }, { "15 seconds", -1 },
{ "20 seconds", 0 }, { "20 seconds", -1 },
}; };
m = rb->menu_init(items, sizeof(items) / sizeof(*items), m = rb->menu_init(items, sizeof(items) / sizeof(*items),
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);

14
apps/plugins/lib/playback_control.c
View file

@ -57,8 +57,8 @@ static bool volume(void)
static bool shuffle(void) static bool shuffle(void)
{ {
struct opt_items names[] = { struct opt_items names[] = {
{"No", 0}, { "No", -1 },
{"Yes", 0} { "Yes", -1 }
}; };
return api->set_option("Shuffle", &api->global_settings->playlist_shuffle, return api->set_option("Shuffle", &api->global_settings->playlist_shuffle,
BOOL, names, 2,NULL); BOOL, names, 2,NULL);
@ -68,12 +68,12 @@ static bool repeat_mode(void)
{ {
bool result; bool result;
static const struct opt_items names[] = { static const struct opt_items names[] = {
{ "Off", 0 }, { "Off", -1 },
{ "Repeat All", 0 }, { "Repeat All", -1 },
{ "Repeat One", 0 }, { "Repeat One", -1 },
{ "Repeat Shuffle", 0 }, { "Repeat Shuffle", -1 },
#ifdef AB_REPEAT_ENABLE #ifdef AB_REPEAT_ENABLE
{ "Repeat A-B", 0 } { "Repeat A-B", -1 }
#endif #endif
}; };

42
apps/plugins/pacbox/pacbox.c
View file

@ -147,42 +147,42 @@ static bool pacbox_menu(void)
bool need_restart = false; bool need_restart = false;
static const struct opt_items noyes[2] = { static const struct opt_items noyes[2] = {
{ "No", 0 }, { "No", -1 },
{ "Yes", 0 }, { "Yes", -1 },
}; };
static const struct opt_items difficulty_options[2] = { static const struct opt_items difficulty_options[2] = {
{ "Normal", 0 }, { "Normal", -1 },
{ "Harder", 0 }, { "Harder", -1 },
}; };
static const struct opt_items numlives_options[4] = { static const struct opt_items numlives_options[4] = {
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "5", 0 }, { "5", -1 },
}; };
static const struct opt_items bonus_options[4] = { static const struct opt_items bonus_options[4] = {
{ "10000 points", 0 }, { "10000 points", -1 },
{ "15000 points", 0 }, { "15000 points", -1 },
{ "20000 points", 0 }, { "20000 points", -1 },
{ "No bonus", 0 }, { "No bonus", -1 },
}; };
static const struct opt_items ghostname_options[2] = { static const struct opt_items ghostname_options[2] = {
{ "Normal", 0 }, { "Normal", -1 },
{ "Alternate", 0 }, { "Alternate", -1 },
}; };
static const struct menu_item items[] = { static const struct menu_item items[] = {
{ "Difficulty", 0 }, { "Difficulty", NULL },
{ "Pacmen Per Game", 0 }, { "Pacmen Per Game", NULL },
{ "Bonus Life", 0 }, { "Bonus Life", NULL },
{ "Ghost Names", 0 }, { "Ghost Names", NULL },
{ "Display FPS", 0 }, { "Display FPS", NULL },
{ "Restart", 0 }, { "Restart", NULL },
{ "Quit", 0 }, { "Quit", NULL },
}; };
m = rb->menu_init(items, sizeof(items) / sizeof(*items), m = rb->menu_init(items, sizeof(items) / sizeof(*items),

28
apps/plugins/rockboy/menu.c
View file

@ -322,29 +322,29 @@ static void do_opt_menu(void)
int result; int result;
static const struct opt_items onoff[2] = { static const struct opt_items onoff[2] = {
{ "Off", 0 }, { "Off", -1 },
{ "On" , 0 }, { "On" , -1 },
}; };
static const struct opt_items fullscreen[]= { static const struct opt_items fullscreen[]= {
{ "Off", 0 }, { "Off", -1 },
{ "Fullscreen", 0 }, { "Fullscreen", -1 },
{ "Full - Maintain Ratio", 0 }, { "Full - Maintain Ratio", -1 },
}; };
static const struct opt_items frameskip[]= { static const struct opt_items frameskip[]= {
{ "3 Max", 0 }, { "3 Max", -1 },
{ "4 Max", 0 }, { "4 Max", -1 },
{ "5 Max", 0 }, { "5 Max", -1 },
{ "6 Max", 0 }, { "6 Max", -1 },
}; };
static const struct menu_item items[] = { static const struct menu_item items[] = {
{"Max Frameskip", 0 }, { "Max Frameskip", NULL },
{"Sound" , 0 }, { "Sound" , NULL },
{"Stats" , 0 }, { "Stats" , NULL },
{"Fullscreen" , 0 }, { "Fullscreen" , NULL },
{"Set Keys (Buggy)", 0 }, { "Set Keys (Buggy)", NULL },
}; };
m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL);

298
apps/plugins/wormlet.c
View file

@ -2103,9 +2103,9 @@ bool set_worm_num_worms(void)
{ {
bool ret; bool ret;
static const struct opt_items num_worms_option[3] = { static const struct opt_items num_worms_option[3] = {
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
}; };
ret = rb->set_option("Number Of Worms", &worm_count,INT, num_worms_option, 3, NULL); ret = rb->set_option("Number Of Worms", &worm_count,INT, num_worms_option, 3, NULL);
@ -2122,10 +2122,10 @@ bool set_worm_num_players(void)
{ {
bool ret; bool ret;
static const struct opt_items num_players_option[4] = { static const struct opt_items num_players_option[4] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 } { "3", -1 }
}; };
ret = rb->set_option("Number of Players", &players, INT,num_players_option , 4, NULL); ret = rb->set_option("Number of Players", &players, INT,num_players_option , 4, NULL);
@ -2144,17 +2144,17 @@ Sets the size of each argh block created
bool set_worm_argh_size(void) bool set_worm_argh_size(void)
{ {
static const struct opt_items argh_size_option[11] = { static const struct opt_items argh_size_option[11] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 } { "10", -1 }
}; };
return rb->set_option("Argh Size", &argh_size,INT,argh_size_option , 11, NULL); return rb->set_option("Argh Size", &argh_size,INT,argh_size_option , 11, NULL);
@ -2166,17 +2166,17 @@ Sets the amount a worm grows per food
bool set_worm_food(void) bool set_worm_food(void)
{ {
static const struct opt_items worm_food_option[11] = { static const struct opt_items worm_food_option[11] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 } { "10", -1 }
}; };
return rb->set_option("Worm Growth Per Food", &worm_food,INT,worm_food_option , 11, NULL); return rb->set_option("Worm Growth Per Food", &worm_food,INT,worm_food_option , 11, NULL);
} }
@ -2187,11 +2187,11 @@ Sets the number of arghs created per food
bool set_argh_per_food(void) bool set_argh_per_food(void)
{ {
static const struct opt_items argh_food_option[5] = { static const struct opt_items argh_food_option[5] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
}; };
return rb->set_option("Arghs Per Food", &arghs_per_food,INT,argh_food_option , 5, NULL); return rb->set_option("Arghs Per Food", &arghs_per_food,INT,argh_food_option , 5, NULL);
} }
@ -2203,25 +2203,25 @@ bool set_worm_speed(void)
{ {
bool ret; bool ret;
static const struct opt_items speed_option[19] = { static const struct opt_items speed_option[19] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 }, { "10", -1 },
{ "11", 0 }, { "11", -1 },
{ "12", 0 }, { "12", -1 },
{ "13", 0 }, { "13", -1 },
{ "14", 0 }, { "14", -1 },
{ "15", 0 }, { "15", -1 },
{ "16", 0 }, { "16", -1 },
{ "17", 0 }, { "17", -1 },
{ "18", 0 }, { "18", -1 },
}; };
@ -2240,17 +2240,17 @@ bool set_bool_options(char* string, bool* variable,
bool set_worm_control_style(void) bool set_worm_control_style(void)
{ {
static const struct opt_items key1_option[2] = { static const struct opt_items key1_option[2] = {
{ "Remote Control", 0 }, { "Remote Control", -1 },
{ "No Rem. Control", 0 }, { "No Rem. Control", -1 },
}; };
static const struct opt_items key2_option[2] = { static const struct opt_items key2_option[2] = {
{ "2 Key Control", 0 }, { "2 Key Control", -1 },
{ "4 Key COntrol", 0 }, { "4 Key COntrol", -1 },
}; };
static const struct opt_items key3_option[1] = { static const struct opt_items key3_option[1] = {
{ "Out of Control", 0 }, { "Out of Control", -1 },
}; };
if (players > 1) { if (players > 1) {
@ -2352,14 +2352,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* Setup screen */ /* Setup screen */
static const struct opt_items noyes[2] = { static const struct opt_items noyes[2] = {
{ "No", 0 }, { "No", -1 },
{ "Yes", 0 }, { "Yes", -1 },
}; };
static const struct opt_items num_worms_option[3] = { static const struct opt_items num_worms_option[3] = {
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 } { "3", -1 }
}; };
#ifdef MULTIPLAYER #ifdef MULTIPLAYER
@ -2367,129 +2367,129 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
#else #else
static const struct opt_items num_players_option[2] = { static const struct opt_items num_players_option[2] = {
#endif #endif
{ "0", 0 }, { "0", -1 },
{ "1", 0 } { "1", -1 }
#ifdef MULTIPLAYER #ifdef MULTIPLAYER
,{ "2", 0 }, ,{ "2", -1 },
{ "3", 0 } { "3", -1 }
#endif #endif
}; };
static const struct opt_items argh_size_option[9] = { static const struct opt_items argh_size_option[9] = {
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 } { "10", -1 }
}; };
static const struct opt_items food_size_option[9] = { static const struct opt_items food_size_option[9] = {
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 } { "10", -1 }
}; };
static const struct opt_items worm_food_option[16] = { static const struct opt_items worm_food_option[16] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 }, { "10", -1 },
{ "11", 0 }, { "11", -1 },
{ "12", 0 }, { "12", -1 },
{ "13", 0 }, { "13", -1 },
{ "14", 0 }, { "14", -1 },
{ "15", 0 } { "15", -1 }
}; };
static const struct opt_items argh_food_option[9] = { static const struct opt_items argh_food_option[9] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 } { "8", -1 }
}; };
static const struct opt_items speed_option[21] = { static const struct opt_items speed_option[21] = {
{ "0", 0 }, { "0", -1 },
{ "1", 0 }, { "1", -1 },
{ "2", 0 }, { "2", -1 },
{ "3", 0 }, { "3", -1 },
{ "4", 0 }, { "4", -1 },
{ "5", 0 }, { "5", -1 },
{ "6", 0 }, { "6", -1 },
{ "7", 0 }, { "7", -1 },
{ "8", 0 }, { "8", -1 },
{ "9", 0 }, { "9", -1 },
{ "10", 0 }, { "10", -1 },
{ "11", 0 }, { "11", -1 },
{ "12", 0 }, { "12", -1 },
{ "13", 0 }, { "13", -1 },
{ "14", 0 }, { "14", -1 },
{ "15", 0 }, { "15", -1 },
{ "16", 0 }, { "16", -1 },
{ "17", 0 }, { "17", -1 },
{ "18", 0 }, { "18", -1 },
{ "19", 0 }, { "19", -1 },
{ "20", 0 } { "20", -1 }
}; };
static const struct opt_items remoteonly_option[1] = { static const struct opt_items remoteonly_option[1] = {
{ "Remote Control", 0 } { "Remote Control", -1 }
}; };
static const struct opt_items key24_option[2] = { static const struct opt_items key24_option[2] = {
{ "4 Key Control", 0 }, { "4 Key Control", -1 },
{ "2 Key Control", 0 } { "2 Key Control", -1 }
}; };
#ifdef REMOTE #ifdef REMOTE
static const struct opt_items remote_option[2] = { static const struct opt_items remote_option[2] = {
{ "Remote Control", 0 }, { "Remote Control", -1 },
{ "No Rem. Control", 0 } { "No Rem. Control", -1 }
}; };
#else #else
static const struct opt_items key2_option[1] = { static const struct opt_items key2_option[1] = {
{ "2 Key Control", 0 } { "2 Key Control", -1 }
}; };
#endif #endif
static const struct opt_items nokey_option[1] = { static const struct opt_items nokey_option[1] = {
{ "Out of Control", 0 } { "Out of Control", -1 }
}; };
static const struct menu_item items[] = { static const struct menu_item items[] = {
{ "Play Wormlet!", 0 }, { "Play Wormlet!", NULL },
{ "Number of Worms", 0 }, { "Number of Worms", NULL },
{ "Number of Players", 0 }, { "Number of Players", NULL },
{ "Control Style", 0 }, { "Control Style", NULL },
{ "Worm Growth Per Food", 0 }, { "Worm Growth Per Food", NULL },
{ "Worm Speed", 0 }, { "Worm Speed", NULL },
{ "Arghs Per Food", 0 }, { "Arghs Per Food", NULL },
{ "Argh Size", 0 }, { "Argh Size", NULL },
{ "Food Size", 0 }, { "Food Size", NULL },
{ "Revert to Default Settings", 0 }, { "Revert to Default Settings", NULL },
{ "Quit", 0 } { "Quit", NULL }
}; };
m = rb->menu_init(items, sizeof(items) / sizeof(*items), m = rb->menu_init(items, sizeof(items) / sizeof(*items),