diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2023-09-22 09:57:48 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2023-09-22 10:00:46 -0400 |
commit | 8cc3266b2a172a51dc12d05e8e1a06485b895e48 (patch) | |
tree | f45e7c9e273037d2f4ea0c72b740c4241458eeb2 /apps/plugins | |
parent | cb3a6877fcbb001a8ee9afd3e4a25579ac40f805 (diff) | |
download | rockbox-8cc3266b2a172a51dc12d05e8e1a06485b895e48.tar.gz rockbox-8cc3266b2a172a51dc12d05e8e1a06485b895e48.zip |
Settings: Rename INT/BOOL setting type enum to RB_INT/RB_BOOL
....Because INT and BOOL are already defined in mingw32.
Change-Id: I28ab8189c00002c8f68bc9d0c23d2ae78d9e33d0
Diffstat (limited to 'apps/plugins')
32 files changed, 103 insertions, 103 deletions
diff --git a/apps/plugins/announce_status.c b/apps/plugins/announce_status.c index 1ccfc1e70a..21518b4d68 100644 --- a/apps/plugins/announce_status.c +++ b/apps/plugins/announce_status.c | |||
@@ -383,7 +383,7 @@ static int settings_menu(void) | |||
383 | break; | 383 | break; |
384 | case 1: | 384 | case 1: |
385 | rb->set_option(rb->str(LANG_ANNOUNCE_ON), | 385 | rb->set_option(rb->str(LANG_ANNOUNCE_ON), |
386 | &gAnnounce.announce_on, INT, announce_options, 2, NULL); | 386 | &gAnnounce.announce_on, RB_INT, announce_options, 2, NULL); |
387 | break; | 387 | break; |
388 | case 2: | 388 | case 2: |
389 | rb->set_int(rb->str(LANG_GROUPING), "", 1, | 389 | rb->set_int(rb->str(LANG_GROUPING), "", 1, |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index de65ce69e1..a26ff8edd8 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -1565,7 +1565,7 @@ static int brickmania_menu(void) | |||
1565 | brickmania_init_game(true); | 1565 | brickmania_init_game(true); |
1566 | return 0; | 1566 | return 0; |
1567 | case 2: | 1567 | case 2: |
1568 | rb->set_option("Difficulty", &difficulty, INT, | 1568 | rb->set_option("Difficulty", &difficulty, RB_INT, |
1569 | options, 2, NULL); | 1569 | options, 2, NULL); |
1570 | break; | 1570 | break; |
1571 | case 3: | 1571 | case 3: |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 765b42ef59..6d1091159f 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -911,7 +911,7 @@ static bool edit_memo(int change, struct shown *shown) | |||
911 | 911 | ||
912 | case 6: /* weekday */ | 912 | case 6: /* weekday */ |
913 | rb->set_option("First Day of Week", &info.first_wday, | 913 | rb->set_option("First Day of Week", &info.first_wday, |
914 | INT, modes, 7, NULL); | 914 | RB_INT, modes, 7, NULL); |
915 | break; | 915 | break; |
916 | 916 | ||
917 | case 7: /* playback control */ | 917 | case 7: /* playback control */ |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 5c87e74e50..78cc292147 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -784,7 +784,7 @@ static int chopMenu(int menunum) | |||
784 | res = -1; | 784 | res = -1; |
785 | break; | 785 | break; |
786 | case 2: | 786 | case 2: |
787 | rb->set_option("Level", &iLevelMode, INT, levels, 2, NULL); | 787 | rb->set_option("Level", &iLevelMode, RB_INT, levels, 2, NULL); |
788 | break; | 788 | break; |
789 | case 3: | 789 | case 3: |
790 | playback_control(NULL); | 790 | playback_control(NULL); |
diff --git a/apps/plugins/clock/clock_menu.c b/apps/plugins/clock/clock_menu.c index a597664f49..8b7a2c82be 100644 --- a/apps/plugins/clock/clock_menu.c +++ b/apps/plugins/clock/clock_menu.c | |||
@@ -81,17 +81,17 @@ static void menu_analog_settings(void) | |||
81 | switch(result){ | 81 | switch(result){ |
82 | case 0: | 82 | case 0: |
83 | rb->set_option("Show Date", &clock_settings.analog.show_date, | 83 | rb->set_option("Show Date", &clock_settings.analog.show_date, |
84 | BOOL, noyes_text, 2, NULL); | 84 | RB_BOOL, noyes_text, 2, NULL); |
85 | break; | 85 | break; |
86 | case 1: | 86 | case 1: |
87 | rb->set_option("Show Second Hand", | 87 | rb->set_option("Show Second Hand", |
88 | &clock_settings.analog.show_seconds, | 88 | &clock_settings.analog.show_seconds, |
89 | BOOL, noyes_text, 2, NULL); | 89 | RB_BOOL, noyes_text, 2, NULL); |
90 | break; | 90 | break; |
91 | case 2: | 91 | case 2: |
92 | rb->set_option("Show Border", | 92 | rb->set_option("Show Border", |
93 | &clock_settings.analog.show_border, | 93 | &clock_settings.analog.show_border, |
94 | BOOL, noyes_text, 2, NULL); | 94 | RB_BOOL, noyes_text, 2, NULL); |
95 | break; | 95 | break; |
96 | } | 96 | } |
97 | } | 97 | } |
@@ -112,12 +112,12 @@ static void menu_digital_settings(void){ | |||
112 | case 0: | 112 | case 0: |
113 | rb->set_option("Show Seconds", | 113 | rb->set_option("Show Seconds", |
114 | &clock_settings.digital.show_seconds, | 114 | &clock_settings.digital.show_seconds, |
115 | BOOL, noyes_text, 2, NULL); | 115 | RB_BOOL, noyes_text, 2, NULL); |
116 | break; | 116 | break; |
117 | case 1: | 117 | case 1: |
118 | rb->set_option("Blinking Colon", | 118 | rb->set_option("Blinking Colon", |
119 | &clock_settings.digital.blinkcolon, | 119 | &clock_settings.digital.blinkcolon, |
120 | BOOL, noyes_text, 2, NULL); | 120 | RB_BOOL, noyes_text, 2, NULL); |
121 | break; | 121 | break; |
122 | } | 122 | } |
123 | } | 123 | } |
@@ -129,7 +129,7 @@ static void menu_digital_settings(void){ | |||
129 | static void confirm_reset(void){ | 129 | static void confirm_reset(void){ |
130 | int result=0; | 130 | int result=0; |
131 | 131 | ||
132 | rb->set_option("Reset all settings?", &result, INT, noyes_text, 2, NULL); | 132 | rb->set_option("Reset all settings?", &result, RB_INT, noyes_text, 2, NULL); |
133 | 133 | ||
134 | if(result == 1){ /* reset! */ | 134 | if(result == 1){ /* reset! */ |
135 | clock_settings_reset(&clock_settings); | 135 | clock_settings_reset(&clock_settings); |
@@ -157,16 +157,16 @@ static void menu_general_settings(void){ | |||
157 | case 0: | 157 | case 0: |
158 | rb->set_option("Hour format", | 158 | rb->set_option("Hour format", |
159 | &clock_settings.general.hour_format, | 159 | &clock_settings.general.hour_format, |
160 | INT, hour_format_text, 2, NULL); | 160 | RB_INT, hour_format_text, 2, NULL); |
161 | break; | 161 | break; |
162 | case 1: | 162 | case 1: |
163 | rb->set_option("Date format", | 163 | rb->set_option("Date format", |
164 | &clock_settings.general.date_format, | 164 | &clock_settings.general.date_format, |
165 | INT, date_format_text, 4, NULL); | 165 | RB_INT, date_format_text, 4, NULL); |
166 | break; | 166 | break; |
167 | case 2: | 167 | case 2: |
168 | rb->set_option("Show Counter", &clock_settings.general.show_counter, | 168 | rb->set_option("Show Counter", &clock_settings.general.show_counter, |
169 | BOOL, noyes_text, 2, NULL); | 169 | RB_BOOL, noyes_text, 2, NULL); |
170 | break; | 170 | break; |
171 | case 3: | 171 | case 3: |
172 | confirm_reset(); | 172 | confirm_reset(); |
@@ -180,7 +180,7 @@ static void menu_general_settings(void){ | |||
180 | case 5: | 180 | case 5: |
181 | rb->set_option("Save On Exit", | 181 | rb->set_option("Save On Exit", |
182 | &clock_settings.general.save_settings, | 182 | &clock_settings.general.save_settings, |
183 | BOOL, noyes_text, 2, NULL); | 183 | RB_BOOL, noyes_text, 2, NULL); |
184 | 184 | ||
185 | /* if we no longer save on exit, | 185 | /* if we no longer save on exit, |
186 | we better save now to remember that */ | 186 | we better save now to remember that */ |
@@ -190,14 +190,14 @@ static void menu_general_settings(void){ | |||
190 | case 6: | 190 | case 6: |
191 | rb->set_option("Backlight Settings", | 191 | rb->set_option("Backlight Settings", |
192 | &clock_settings.general.backlight, | 192 | &clock_settings.general.backlight, |
193 | INT, backlight_settings_text, 3, NULL); | 193 | RB_INT, backlight_settings_text, 3, NULL); |
194 | apply_backlight_setting(clock_settings.general.backlight); | 194 | apply_backlight_setting(clock_settings.general.backlight); |
195 | break; | 195 | break; |
196 | 196 | ||
197 | case 7: | 197 | case 7: |
198 | rb->set_option("Idle Poweroff (temporary)", | 198 | rb->set_option("Idle Poweroff (temporary)", |
199 | &clock_settings.general.idle_poweroff, | 199 | &clock_settings.general.idle_poweroff, |
200 | BOOL, idle_poweroff_text, 2, NULL); | 200 | RB_BOOL, idle_poweroff_text, 2, NULL); |
201 | break; | 201 | break; |
202 | } | 202 | } |
203 | } | 203 | } |
diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c index 7580697267..8f2315cde8 100644 --- a/apps/plugins/dice.c +++ b/apps/plugins/dice.c | |||
@@ -201,7 +201,7 @@ static bool dice_menu(struct dices * dice) { | |||
201 | break; | 201 | break; |
202 | 202 | ||
203 | case 2: | 203 | case 2: |
204 | rb->set_option("Number of Sides", &sides_index, INT, | 204 | rb->set_option("Number of Sides", &sides_index, RB_INT, |
205 | nb_sides_option, | 205 | nb_sides_option, |
206 | sizeof(nb_sides_values)/sizeof(int), NULL); | 206 | sizeof(nb_sides_values)/sizeof(int), NULL); |
207 | dice->nb_sides=nb_sides_values[sides_index]; | 207 | dice->nb_sides=nb_sides_values[sides_index]; |
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index b68107f8aa..04817d4722 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -490,7 +490,7 @@ int Oset_keys() | |||
490 | else | 490 | else |
491 | { | 491 | { |
492 | *keys[result]=translatekey(*keys[result]); | 492 | *keys[result]=translatekey(*keys[result]); |
493 | rb->set_option(menu_[result], keys[result], INT, doomkeys, numdoomkeys, NULL ); | 493 | rb->set_option(menu_[result], keys[result], RB_INT, doomkeys, numdoomkeys, NULL ); |
494 | *keys[result]=translatekey(*keys[result]); | 494 | *keys[result]=translatekey(*keys[result]); |
495 | } | 495 | } |
496 | } | 496 | } |
@@ -540,7 +540,7 @@ static bool Doptions() | |||
540 | if(result==0) | 540 | if(result==0) |
541 | Oset_keys(); | 541 | Oset_keys(); |
542 | else if (result > 0) | 542 | else if (result > 0) |
543 | rb->set_option(menu_[result], options[result-1], INT, onoff, 2, NULL ); | 543 | rb->set_option(menu_[result], options[result-1], RB_INT, onoff, 2, NULL ); |
544 | else | 544 | else |
545 | menuquit=1; | 545 | menuquit=1; |
546 | } | 546 | } |
@@ -620,7 +620,7 @@ int doom_menu() | |||
620 | result = rb->do_menu(&menu, &selected, NULL, false); | 620 | result = rb->do_menu(&menu, &selected, NULL, false); |
621 | switch (result) { | 621 | switch (result) { |
622 | case 0: /* Game picker */ | 622 | case 0: /* Game picker */ |
623 | rb->set_option("Game WAD", &gamever, INT, names, status, NULL ); | 623 | rb->set_option("Game WAD", &gamever, RB_INT, names, status, NULL ); |
624 | break; | 624 | break; |
625 | 625 | ||
626 | case 1: /* Addon picker */ | 626 | case 1: /* Addon picker */ |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 54a6d07c20..5f547ed5e0 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -312,32 +312,32 @@ static void fireworks_menu(void) | |||
312 | break; | 312 | break; |
313 | 313 | ||
314 | case 1: | 314 | case 1: |
315 | rb->set_option("Auto-Fire", &autofire_delay, INT, | 315 | rb->set_option("Auto-Fire", &autofire_delay, RB_INT, |
316 | autofire_delay_settings, 15, NULL); | 316 | autofire_delay_settings, 15, NULL); |
317 | break; | 317 | break; |
318 | 318 | ||
319 | case 2: | 319 | case 2: |
320 | rb->set_option("Particles Per Firework", &particles_per_firework, | 320 | rb->set_option("Particles Per Firework", &particles_per_firework, |
321 | INT, particle_settings, 8, NULL); | 321 | RB_INT, particle_settings, 8, NULL); |
322 | break; | 322 | break; |
323 | 323 | ||
324 | case 3: | 324 | case 3: |
325 | rb->set_option("Particle Life", &particle_life, INT, | 325 | rb->set_option("Particle Life", &particle_life, RB_INT, |
326 | particle_life_settings, 9, NULL); | 326 | particle_life_settings, 9, NULL); |
327 | break; | 327 | break; |
328 | 328 | ||
329 | case 4: | 329 | case 4: |
330 | rb->set_option("Gravity", &gravity, INT, | 330 | rb->set_option("Gravity", &gravity, RB_INT, |
331 | gravity_settings, 4, NULL); | 331 | gravity_settings, 4, NULL); |
332 | break; | 332 | break; |
333 | 333 | ||
334 | case 5: | 334 | case 5: |
335 | rb->set_option("Show Rockets", &show_rockets, INT, | 335 | rb->set_option("Show Rockets", &show_rockets, RB_INT, |
336 | rocket_settings, 3, NULL); | 336 | rocket_settings, 3, NULL); |
337 | break; | 337 | break; |
338 | 338 | ||
339 | case 6: | 339 | case 6: |
340 | rb->set_option("FPS (Speed)", &frames_per_second, INT, | 340 | rb->set_option("FPS (Speed)", &frames_per_second, RB_INT, |
341 | fps_settings, 9, NULL); | 341 | fps_settings, 9, NULL); |
342 | break; | 342 | break; |
343 | 343 | ||
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index c77b22fdae..d1a512c4fd 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -230,7 +230,7 @@ static bool set_option_dithering(void) | |||
230 | [DITHER_DIFFUSION] = { STR(LANG_DIFFUSION) }, | 230 | [DITHER_DIFFUSION] = { STR(LANG_DIFFUSION) }, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | rb->set_option(rb->str(LANG_DITHERING), &settings.jpeg_dither_mode, INT, | 233 | rb->set_option(rb->str(LANG_DITHERING), &settings.jpeg_dither_mode, RB_INT, |
234 | dithering, DITHER_NUM_MODES, NULL); | 234 | dithering, DITHER_NUM_MODES, NULL); |
235 | return false; | 235 | return false; |
236 | } | 236 | } |
@@ -290,7 +290,7 @@ static int show_menu(void) /* return 1 to quit */ | |||
290 | case MIID_RETURN: | 290 | case MIID_RETURN: |
291 | break; | 291 | break; |
292 | case MIID_TOGGLE_SS_MODE: | 292 | case MIID_TOGGLE_SS_MODE: |
293 | rb->set_option(rb->str(LANG_SLIDESHOW_MODE), &iv_api.slideshow_enabled, BOOL, | 293 | rb->set_option(rb->str(LANG_SLIDESHOW_MODE), &iv_api.slideshow_enabled, RB_BOOL, |
294 | slideshow , 2, NULL); | 294 | slideshow , 2, NULL); |
295 | break; | 295 | break; |
296 | case MIID_CHANGE_SS_MODE: | 296 | case MIID_CHANGE_SS_MODE: |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 1536b785b4..3a65e8ba64 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -1481,7 +1481,7 @@ static int jewels_game_menu(struct game_context* bj, bool ingame) | |||
1481 | jewels_init(bj); | 1481 | jewels_init(bj); |
1482 | return 0; | 1482 | return 0; |
1483 | case 2: | 1483 | case 2: |
1484 | rb->set_option("Mode", &bj->tmp_type, INT, mode, 2, NULL); | 1484 | rb->set_option("Mode", &bj->tmp_type, RB_INT, mode, 2, NULL); |
1485 | break; | 1485 | break; |
1486 | case 3: | 1486 | case 3: |
1487 | if(jewels_help()) | 1487 | if(jewels_help()) |
diff --git a/apps/plugins/lastfm_scrobbler_viewer.c b/apps/plugins/lastfm_scrobbler_viewer.c index c8b125c293..c35ba64918 100644 --- a/apps/plugins/lastfm_scrobbler_viewer.c +++ b/apps/plugins/lastfm_scrobbler_viewer.c | |||
@@ -478,7 +478,7 @@ static int filter_items(struct printcell_data_t *pc_data, | |||
478 | {"Exclude Any", -1}, {"Include", -1}, | 478 | {"Exclude Any", -1}, {"Include", -1}, |
479 | {"Include Case Sensitive", -1}, {"Include Any", -1} | 479 | {"Include Case Sensitive", -1}, {"Include Any", -1} |
480 | }; | 480 | }; |
481 | if (rb->set_option("Find Type", &option, INT, | 481 | if (rb->set_option("Find Type", &option, RB_INT, |
482 | find_types, 6, NULL)) | 482 | find_types, 6, NULL)) |
483 | { | 483 | { |
484 | return 0; | 484 | return 0; |
diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c index de31733671..d341e6b7a5 100644 --- a/apps/plugins/lrcplayer.c +++ b/apps/plugins/lrcplayer.c | |||
@@ -2288,7 +2288,7 @@ static bool lrc_display_menu(void) | |||
2288 | usb = rb->set_bool("Wipe", &prefs.wipe); | 2288 | usb = rb->set_bool("Wipe", &prefs.wipe); |
2289 | break; | 2289 | break; |
2290 | case LRC_MENU_ALIGN: | 2290 | case LRC_MENU_ALIGN: |
2291 | usb = rb->set_option("Alignment", &prefs.align, INT, | 2291 | usb = rb->set_option("Alignment", &prefs.align, RB_INT, |
2292 | align_names, 3, NULL); | 2292 | align_names, 3, NULL); |
2293 | break; | 2293 | break; |
2294 | case LRC_MENU_LINE_MODE: | 2294 | case LRC_MENU_LINE_MODE: |
@@ -2345,7 +2345,7 @@ static bool lrc_lyrics_menu(void) | |||
2345 | case LRC_MENU_ENCODING: | 2345 | case LRC_MENU_ENCODING: |
2346 | prefs.encoding++; | 2346 | prefs.encoding++; |
2347 | old_val = prefs.encoding; | 2347 | old_val = prefs.encoding; |
2348 | usb = rb->set_option("Encoding", &prefs.encoding, INT, | 2348 | usb = rb->set_option("Encoding", &prefs.encoding, RB_INT, |
2349 | cp_names, NUM_CODEPAGES+1, NULL); | 2349 | cp_names, NUM_CODEPAGES+1, NULL); |
2350 | if (prefs.encoding != old_val) | 2350 | if (prefs.encoding != old_val) |
2351 | { | 2351 | { |
diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c index 65633c0ad1..5179848549 100644 --- a/apps/plugins/mikmod/mikmod.c +++ b/apps/plugins/mikmod/mikmod.c | |||
@@ -623,7 +623,7 @@ static int settings_menu(void) | |||
623 | break; | 623 | break; |
624 | 624 | ||
625 | case 6: | 625 | case 6: |
626 | rb->set_option(rb->str(LANG_MIKMOD_SAMPLERATE), &(settings.sample_rate), INT, sr_names, | 626 | rb->set_option(rb->str(LANG_MIKMOD_SAMPLERATE), &(settings.sample_rate), RB_INT, sr_names, |
627 | HW_NUM_FREQ, NULL); | 627 | HW_NUM_FREQ, NULL); |
628 | applysettings(); | 628 | applysettings(); |
629 | break; | 629 | break; |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index c904de466d..6464f37217 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -1199,7 +1199,7 @@ static void display_options(void) | |||
1199 | #if MPEG_OPTION_DITHERING_ENABLED | 1199 | #if MPEG_OPTION_DITHERING_ENABLED |
1200 | case MPEG_OPTION_DITHERING: | 1200 | case MPEG_OPTION_DITHERING: |
1201 | result = (settings.displayoptions & LCD_YUV_DITHER) ? 1 : 0; | 1201 | result = (settings.displayoptions & LCD_YUV_DITHER) ? 1 : 0; |
1202 | mpeg_set_option(rb->str(LANG_DITHERING), &result, INT, noyes, 2, NULL); | 1202 | mpeg_set_option(rb->str(LANG_DITHERING), &result, RB_INT, noyes, 2, NULL); |
1203 | settings.displayoptions = | 1203 | settings.displayoptions = |
1204 | (settings.displayoptions & ~LCD_YUV_DITHER) | 1204 | (settings.displayoptions & ~LCD_YUV_DITHER) |
1205 | | ((result != 0) ? LCD_YUV_DITHER : 0); | 1205 | | ((result != 0) ? LCD_YUV_DITHER : 0); |
@@ -1208,17 +1208,17 @@ static void display_options(void) | |||
1208 | #endif /* MPEG_OPTION_DITHERING_ENABLED */ | 1208 | #endif /* MPEG_OPTION_DITHERING_ENABLED */ |
1209 | 1209 | ||
1210 | case MPEG_OPTION_DISPLAY_FPS: | 1210 | case MPEG_OPTION_DISPLAY_FPS: |
1211 | mpeg_set_option(rb->str(LANG_DISPLAY_FPS), &settings.showfps, INT, | 1211 | mpeg_set_option(rb->str(LANG_DISPLAY_FPS), &settings.showfps, RB_INT, |
1212 | noyes, 2, NULL); | 1212 | noyes, 2, NULL); |
1213 | break; | 1213 | break; |
1214 | 1214 | ||
1215 | case MPEG_OPTION_LIMIT_FPS: | 1215 | case MPEG_OPTION_LIMIT_FPS: |
1216 | mpeg_set_option(rb->str(LANG_LIMIT_FPS), &settings.limitfps, INT, | 1216 | mpeg_set_option(rb->str(LANG_LIMIT_FPS), &settings.limitfps, RB_INT, |
1217 | noyes, 2, NULL); | 1217 | noyes, 2, NULL); |
1218 | break; | 1218 | break; |
1219 | 1219 | ||
1220 | case MPEG_OPTION_SKIP_FRAMES: | 1220 | case MPEG_OPTION_SKIP_FRAMES: |
1221 | mpeg_set_option(rb->str(LANG_SKIP_FRAMES), &settings.skipframes, INT, | 1221 | mpeg_set_option(rb->str(LANG_SKIP_FRAMES), &settings.skipframes, RB_INT, |
1222 | noyes, 2, NULL); | 1222 | noyes, 2, NULL); |
1223 | break; | 1223 | break; |
1224 | 1224 | ||
@@ -1269,31 +1269,31 @@ static void audio_options(void) | |||
1269 | switch (result) | 1269 | switch (result) |
1270 | { | 1270 | { |
1271 | case MPEG_AUDIO_TONE_CONTROLS: | 1271 | case MPEG_AUDIO_TONE_CONTROLS: |
1272 | mpeg_set_option(rb->str(LANG_TONE_CONTROLS), &settings.tone_controls, INT, | 1272 | mpeg_set_option(rb->str(LANG_TONE_CONTROLS), &settings.tone_controls, RB_INT, |
1273 | globaloff, 2, NULL); | 1273 | globaloff, 2, NULL); |
1274 | sync_audio_setting(result, false); | 1274 | sync_audio_setting(result, false); |
1275 | break; | 1275 | break; |
1276 | 1276 | ||
1277 | case MPEG_AUDIO_CHANNEL_MODES: | 1277 | case MPEG_AUDIO_CHANNEL_MODES: |
1278 | mpeg_set_option(rb->str(LANG_CHANNEL_CONFIGURATION), &settings.channel_modes, | 1278 | mpeg_set_option(rb->str(LANG_CHANNEL_CONFIGURATION), &settings.channel_modes, |
1279 | INT, globaloff, 2, NULL); | 1279 | RB_INT, globaloff, 2, NULL); |
1280 | sync_audio_setting(result, false); | 1280 | sync_audio_setting(result, false); |
1281 | break; | 1281 | break; |
1282 | 1282 | ||
1283 | case MPEG_AUDIO_CROSSFEED: | 1283 | case MPEG_AUDIO_CROSSFEED: |
1284 | mpeg_set_option(rb->str(LANG_CROSSFEED), &settings.crossfeed, INT, | 1284 | mpeg_set_option(rb->str(LANG_CROSSFEED), &settings.crossfeed, RB_INT, |
1285 | globaloff, 2, NULL); | 1285 | globaloff, 2, NULL); |
1286 | sync_audio_setting(result, false); | 1286 | sync_audio_setting(result, false); |
1287 | break; | 1287 | break; |
1288 | 1288 | ||
1289 | case MPEG_AUDIO_EQUALIZER: | 1289 | case MPEG_AUDIO_EQUALIZER: |
1290 | mpeg_set_option(rb->str(LANG_EQUALIZER), &settings.equalizer, INT, | 1290 | mpeg_set_option(rb->str(LANG_EQUALIZER), &settings.equalizer, RB_INT, |
1291 | globaloff, 2, NULL); | 1291 | globaloff, 2, NULL); |
1292 | sync_audio_setting(result, false); | 1292 | sync_audio_setting(result, false); |
1293 | break; | 1293 | break; |
1294 | 1294 | ||
1295 | case MPEG_AUDIO_DITHERING: | 1295 | case MPEG_AUDIO_DITHERING: |
1296 | mpeg_set_option(rb->str(LANG_DITHERING), &settings.dithering, INT, | 1296 | mpeg_set_option(rb->str(LANG_DITHERING), &settings.dithering, RB_INT, |
1297 | globaloff, 2, NULL); | 1297 | globaloff, 2, NULL); |
1298 | sync_audio_setting(result, false); | 1298 | sync_audio_setting(result, false); |
1299 | break; | 1299 | break; |
@@ -1322,7 +1322,7 @@ static void resume_options(void) | |||
1322 | }; | 1322 | }; |
1323 | 1323 | ||
1324 | mpeg_set_option(rb->str(LANG_MENU_RESUME_OPTIONS), &settings.resume_options, | 1324 | mpeg_set_option(rb->str(LANG_MENU_RESUME_OPTIONS), &settings.resume_options, |
1325 | INT, items, MPEG_RESUME_NUM_OPTIONS, NULL); | 1325 | RB_INT, items, MPEG_RESUME_NUM_OPTIONS, NULL); |
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | static void clear_resume_count(void) | 1328 | static void clear_resume_count(void) |
@@ -1369,7 +1369,7 @@ static void mpeg_settings(void) | |||
1369 | 1369 | ||
1370 | case MPEG_SETTING_PLAY_MODE: | 1370 | case MPEG_SETTING_PLAY_MODE: |
1371 | mpeg_set_option(rb->str(LANG_MENU_PLAY_MODE), &settings.play_mode, | 1371 | mpeg_set_option(rb->str(LANG_MENU_PLAY_MODE), &settings.play_mode, |
1372 | INT, singleall, 2, NULL); | 1372 | RB_INT, singleall, 2, NULL); |
1373 | break; | 1373 | break; |
1374 | 1374 | ||
1375 | case MPEG_SETTING_CLEAR_RESUMES: | 1375 | case MPEG_SETTING_CLEAR_RESUMES: |
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c index 9434aed743..b306503862 100755 --- a/apps/plugins/pacbox/pacbox.c +++ b/apps/plugins/pacbox/pacbox.c | |||
@@ -266,7 +266,7 @@ static bool pacbox_menu(void) | |||
266 | { | 266 | { |
267 | case PBMI_DIFFICULTY: | 267 | case PBMI_DIFFICULTY: |
268 | new_setting=settings.difficulty; | 268 | new_setting=settings.difficulty; |
269 | rb->set_option("Difficulty", &new_setting, INT, | 269 | rb->set_option("Difficulty", &new_setting, RB_INT, |
270 | difficulty_options , 2, NULL); | 270 | difficulty_options , 2, NULL); |
271 | if (new_setting != settings.difficulty) { | 271 | if (new_setting != settings.difficulty) { |
272 | settings.difficulty=new_setting; | 272 | settings.difficulty=new_setting; |
@@ -275,7 +275,7 @@ static bool pacbox_menu(void) | |||
275 | break; | 275 | break; |
276 | case PBMI_PACMEN_PER_GAME: | 276 | case PBMI_PACMEN_PER_GAME: |
277 | new_setting=settings.numlives; | 277 | new_setting=settings.numlives; |
278 | rb->set_option("Pacmen Per Game", &new_setting, INT, | 278 | rb->set_option("Pacmen Per Game", &new_setting, RB_INT, |
279 | numlives_options , 4, NULL); | 279 | numlives_options , 4, NULL); |
280 | if (new_setting != settings.numlives) { | 280 | if (new_setting != settings.numlives) { |
281 | settings.numlives=new_setting; | 281 | settings.numlives=new_setting; |
@@ -284,7 +284,7 @@ static bool pacbox_menu(void) | |||
284 | break; | 284 | break; |
285 | case PBMI_BONUS_LIFE: | 285 | case PBMI_BONUS_LIFE: |
286 | new_setting=settings.bonus; | 286 | new_setting=settings.bonus; |
287 | rb->set_option("Bonus Life", &new_setting, INT, | 287 | rb->set_option("Bonus Life", &new_setting, RB_INT, |
288 | bonus_options , 4, NULL); | 288 | bonus_options , 4, NULL); |
289 | if (new_setting != settings.bonus) { | 289 | if (new_setting != settings.bonus) { |
290 | settings.bonus=new_setting; | 290 | settings.bonus=new_setting; |
@@ -293,7 +293,7 @@ static bool pacbox_menu(void) | |||
293 | break; | 293 | break; |
294 | case PBMI_GHOST_NAMES: | 294 | case PBMI_GHOST_NAMES: |
295 | new_setting=settings.ghostnames; | 295 | new_setting=settings.ghostnames; |
296 | rb->set_option("Ghost Names", &new_setting, INT, | 296 | rb->set_option("Ghost Names", &new_setting, RB_INT, |
297 | ghostname_options , 2, NULL); | 297 | ghostname_options , 2, NULL); |
298 | if (new_setting != settings.ghostnames) { | 298 | if (new_setting != settings.ghostnames) { |
299 | settings.ghostnames=new_setting; | 299 | settings.ghostnames=new_setting; |
@@ -301,16 +301,16 @@ static bool pacbox_menu(void) | |||
301 | } | 301 | } |
302 | break; | 302 | break; |
303 | case PBMI_DISPLAY_FPS: | 303 | case PBMI_DISPLAY_FPS: |
304 | rb->set_option("Display FPS",&settings.showfps,INT, | 304 | rb->set_option("Display FPS",&settings.showfps, RB_INT, |
305 | noyes, 2, NULL); | 305 | noyes, 2, NULL); |
306 | break; | 306 | break; |
307 | case PBMI_SOUND: | 307 | case PBMI_SOUND: |
308 | rb->set_option("Sound",&settings.sound, INT, | 308 | rb->set_option("Sound",&settings.sound, RB_INT, |
309 | noyes, 2, NULL); | 309 | noyes, 2, NULL); |
310 | break; | 310 | break; |
311 | #ifdef AI | 311 | #ifdef AI |
312 | case PBMI_AI: | 312 | case PBMI_AI: |
313 | rb->set_option("AI",&settings.ai, INT, | 313 | rb->set_option("AI",&settings.ai, RB_INT, |
314 | noyes, 2, NULL); | 314 | noyes, 2, NULL); |
315 | break; | 315 | break; |
316 | #endif | 316 | #endif |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index b21faf1dd8..c49d23dc49 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -3552,7 +3552,7 @@ static int settings_menu(void) | |||
3552 | case 0: | 3552 | case 0: |
3553 | old_val = pf_cfg.show_album_name; | 3553 | old_val = pf_cfg.show_album_name; |
3554 | rb->set_option(rb->str(LANG_SHOW_ALBUM_TITLE), | 3554 | rb->set_option(rb->str(LANG_SHOW_ALBUM_TITLE), |
3555 | &pf_cfg.show_album_name, INT, album_name_options, 5, NULL); | 3555 | &pf_cfg.show_album_name, RB_INT, album_name_options, 5, NULL); |
3556 | adjust_album_display_for_setting(old_val, pf_cfg.show_album_name); | 3556 | adjust_album_display_for_setting(old_val, pf_cfg.show_album_name); |
3557 | break; | 3557 | break; |
3558 | case 1: | 3558 | case 1: |
@@ -3561,7 +3561,7 @@ static int settings_menu(void) | |||
3561 | case 2: | 3561 | case 2: |
3562 | old_val = pf_cfg.sort_albums_by; | 3562 | old_val = pf_cfg.sort_albums_by; |
3563 | rb->set_option(rb->str(LANG_SORT_ALBUMS_BY), | 3563 | rb->set_option(rb->str(LANG_SORT_ALBUMS_BY), |
3564 | &pf_cfg.sort_albums_by, INT, sort_options, 4, NULL); | 3564 | &pf_cfg.sort_albums_by, RB_INT, sort_options, 4, NULL); |
3565 | if (old_val != pf_cfg.sort_albums_by && | 3565 | if (old_val != pf_cfg.sort_albums_by && |
3566 | !sort_albums(pf_cfg.sort_albums_by, true)) | 3566 | !sort_albums(pf_cfg.sort_albums_by, true)) |
3567 | pf_cfg.sort_albums_by = old_val; | 3567 | pf_cfg.sort_albums_by = old_val; |
@@ -3569,7 +3569,7 @@ static int settings_menu(void) | |||
3569 | case 3: | 3569 | case 3: |
3570 | old_val = pf_cfg.year_sort_order; | 3570 | old_val = pf_cfg.year_sort_order; |
3571 | rb->set_option(rb->str(LANG_YEAR_SORT_ORDER), | 3571 | rb->set_option(rb->str(LANG_YEAR_SORT_ORDER), |
3572 | &pf_cfg.year_sort_order, INT, year_sort_order_options, 2, NULL); | 3572 | &pf_cfg.year_sort_order, RB_INT, year_sort_order_options, 2, NULL); |
3573 | if (old_val != pf_cfg.year_sort_order && | 3573 | if (old_val != pf_cfg.year_sort_order && |
3574 | !sort_albums(pf_cfg.sort_albums_by, true)) | 3574 | !sort_albums(pf_cfg.sort_albums_by, true)) |
3575 | pf_cfg.year_sort_order = old_val; | 3575 | pf_cfg.year_sort_order = old_val; |
@@ -3635,11 +3635,11 @@ static int settings_menu(void) | |||
3635 | break; | 3635 | break; |
3636 | case 12: | 3636 | case 12: |
3637 | rb->set_option(rb->str(LANG_WPS_INTEGRATION), | 3637 | rb->set_option(rb->str(LANG_WPS_INTEGRATION), |
3638 | &pf_cfg.auto_wps, INT, wps_options, 3, NULL); | 3638 | &pf_cfg.auto_wps, RB_INT, wps_options, 3, NULL); |
3639 | break; | 3639 | break; |
3640 | case 13: | 3640 | case 13: |
3641 | rb->set_option(rb->str(LANG_BACKLIGHT), | 3641 | rb->set_option(rb->str(LANG_BACKLIGHT), |
3642 | &pf_cfg.backlight_mode, INT, backlight_options, 2, NULL); | 3642 | &pf_cfg.backlight_mode, RB_INT, backlight_options, 2, NULL); |
3643 | break; | 3643 | break; |
3644 | 3644 | ||
3645 | case MENU_ATTACHED_USB: | 3645 | case MENU_ATTACHED_USB: |
diff --git a/apps/plugins/pitch_detector.c b/apps/plugins/pitch_detector.c index e9b1fb11b0..f7d1219445 100644 --- a/apps/plugins/pitch_detector.c +++ b/apps/plugins/pitch_detector.c | |||
@@ -503,19 +503,19 @@ static bool main_menu(void) | |||
503 | rb->set_option( | 503 | rb->set_option( |
504 | "Algorithm Pickiness (Lower -> more discriminating)", | 504 | "Algorithm Pickiness (Lower -> more discriminating)", |
505 | &settings.yin_threshold, | 505 | &settings.yin_threshold, |
506 | INT, yin_threshold_text, | 506 | RB_INT, yin_threshold_text, |
507 | sizeof(yin_threshold_text) / sizeof(yin_threshold_text[0]), | 507 | sizeof(yin_threshold_text) / sizeof(yin_threshold_text[0]), |
508 | NULL); | 508 | NULL); |
509 | break; | 509 | break; |
510 | case 5: | 510 | case 5: |
511 | rb->set_option("Display Accidentals As", | 511 | rb->set_option("Display Accidentals As", |
512 | &settings.use_sharps, | 512 | &settings.use_sharps, |
513 | BOOL, accidental_text, 2, NULL); | 513 | RB_BOOL, accidental_text, 2, NULL); |
514 | break; | 514 | break; |
515 | case 6: | 515 | case 6: |
516 | rb->set_option("Key Transposition", | 516 | rb->set_option("Key Transposition", |
517 | &settings.key_transposition, | 517 | &settings.key_transposition, |
518 | INT, transpose_text, 12, NULL); | 518 | RB_INT, transpose_text, 12, NULL); |
519 | break; | 519 | break; |
520 | case 7: | 520 | case 7: |
521 | rb->set_bool("Display Frequency (Hz)", | 521 | rb->set_bool("Display Frequency (Hz)", |
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index 74dd98b676..e4bb232a26 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c | |||
@@ -400,7 +400,7 @@ static bool reversi_gui_choose_strategy( | |||
400 | } | 400 | } |
401 | 401 | ||
402 | result = | 402 | result = |
403 | rb->set_option(prompt, &index, INT, strategy_settings, num_items, NULL); | 403 | rb->set_option(prompt, &index, RB_INT, strategy_settings, num_items, NULL); |
404 | 404 | ||
405 | (*player) = strategy_values[index]; | 405 | (*player) = strategy_values[index]; |
406 | 406 | ||
@@ -450,7 +450,7 @@ static bool reversi_gui_menu(void) { | |||
450 | break; | 450 | break; |
451 | } | 451 | } |
452 | } | 452 | } |
453 | rb->set_option(MENU_TEXT_WRAP_MODE, &index, INT, | 453 | rb->set_option(MENU_TEXT_WRAP_MODE, &index, RB_INT, |
454 | cursor_wrap_mode_settings, 3, NULL); | 454 | cursor_wrap_mode_settings, 3, NULL); |
455 | cursor_wrap_mode = cursor_wrap_mode_values[index]; | 455 | cursor_wrap_mode = cursor_wrap_mode_values[index]; |
456 | break; | 456 | break; |
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index 7fd7aabdc8..870ea389fb 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -437,39 +437,39 @@ static void do_opt_menu(void) | |||
437 | switch (result) | 437 | switch (result) |
438 | { | 438 | { |
439 | case 0: /* Frameskip */ | 439 | case 0: /* Frameskip */ |
440 | rb->set_option("Max Frameskip", &options.maxskip, INT, frameskip, | 440 | rb->set_option("Max Frameskip", &options.maxskip, RB_INT, frameskip, |
441 | sizeof(frameskip)/sizeof(*frameskip), NULL ); | 441 | sizeof(frameskip)/sizeof(*frameskip), NULL ); |
442 | break; | 442 | break; |
443 | case 1: /* Autosave */ | 443 | case 1: /* Autosave */ |
444 | rb->set_option("Autosave", &options.autosave, INT, onoff, 2, NULL ); | 444 | rb->set_option("Autosave", &options.autosave, RB_INT, onoff, 2, NULL ); |
445 | break; | 445 | break; |
446 | case 2: /* Sound */ | 446 | case 2: /* Sound */ |
447 | if(options.sound>1) options.sound=1; | 447 | if(options.sound>1) options.sound=1; |
448 | rb->set_option("Sound", &options.sound, INT, onoff, 2, NULL ); | 448 | rb->set_option("Sound", &options.sound, RB_INT, onoff, 2, NULL ); |
449 | if(options.sound) sound_dirty(); | 449 | if(options.sound) sound_dirty(); |
450 | break; | 450 | break; |
451 | case 3: /* Volume */ | 451 | case 3: /* Volume */ |
452 | rb->option_screen((struct settings_list*)vol, parentvp, false, "Volume"); | 452 | rb->option_screen((struct settings_list*)vol, parentvp, false, "Volume"); |
453 | break; | 453 | break; |
454 | case 4: /* Stats */ | 454 | case 4: /* Stats */ |
455 | rb->set_option("Stats", &options.showstats, INT, stats, 3, NULL ); | 455 | rb->set_option("Stats", &options.showstats, RB_INT, stats, 3, NULL ); |
456 | break; | 456 | break; |
457 | case 5: /* Keys */ | 457 | case 5: /* Keys */ |
458 | setupkeys(); | 458 | setupkeys(); |
459 | break; | 459 | break; |
460 | #ifdef HAVE_LCD_COLOR | 460 | #ifdef HAVE_LCD_COLOR |
461 | case 6: /* Screen Size */ | 461 | case 6: /* Screen Size */ |
462 | rb->set_option("Screen Size", &options.scaling, INT, scaling, | 462 | rb->set_option("Screen Size", &options.scaling, RB_INT, scaling, |
463 | sizeof(scaling)/sizeof(*scaling), NULL ); | 463 | sizeof(scaling)/sizeof(*scaling), NULL ); |
464 | setvidmode(); | 464 | setvidmode(); |
465 | break; | 465 | break; |
466 | case 7: /* Screen rotate */ | 466 | case 7: /* Screen rotate */ |
467 | rb->set_option("Screen Rotate", &options.rotate, INT, rotate, | 467 | rb->set_option("Screen Rotate", &options.rotate, RB_INT, rotate, |
468 | sizeof(rotate)/sizeof(*rotate), NULL ); | 468 | sizeof(rotate)/sizeof(*rotate), NULL ); |
469 | setvidmode(); | 469 | setvidmode(); |
470 | break; | 470 | break; |
471 | case 8: /* Palette */ | 471 | case 8: /* Palette */ |
472 | rb->set_option("Set Palette", &options.pal, INT, palette, 17, NULL ); | 472 | rb->set_option("Set Palette", &options.pal, RB_INT, palette, 17, NULL ); |
473 | set_pal(); | 473 | set_pal(); |
474 | break; | 474 | break; |
475 | #endif | 475 | #endif |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index cba1701eb6..52281edfb0 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -2869,7 +2869,7 @@ static void goto_menu(void) | |||
2869 | case MAIN_MENU_BRUSH_SIZE: | 2869 | case MAIN_MENU_BRUSH_SIZE: |
2870 | for(multi = 0; multi<4; multi++) | 2870 | for(multi = 0; multi<4; multi++) |
2871 | if(bsize == times_list[multi]) break; | 2871 | if(bsize == times_list[multi]) break; |
2872 | rb->set_option( "Brush Size", &multi, INT, times_options, 4, NULL ); | 2872 | rb->set_option( "Brush Size", &multi, RB_INT, times_options, 4, NULL ); |
2873 | if( multi >= 0 ) | 2873 | if( multi >= 0 ) |
2874 | bsize = times_list[multi]; | 2874 | bsize = times_list[multi]; |
2875 | break; | 2875 | break; |
@@ -2877,7 +2877,7 @@ static void goto_menu(void) | |||
2877 | case MAIN_MENU_BRUSH_SPEED: | 2877 | case MAIN_MENU_BRUSH_SPEED: |
2878 | for(multi = 0; multi<3; multi++) | 2878 | for(multi = 0; multi<3; multi++) |
2879 | if(bspeed == times_list[multi]) break; | 2879 | if(bspeed == times_list[multi]) break; |
2880 | rb->set_option( "Brush Speed", &multi, INT, times_options, 3, NULL ); | 2880 | rb->set_option( "Brush Speed", &multi, RB_INT, times_options, 3, NULL ); |
2881 | if( multi >= 0 ) { | 2881 | if( multi >= 0 ) { |
2882 | bspeed = times_list[multi]; | 2882 | bspeed = times_list[multi]; |
2883 | incdec_x.step[0] = bspeed; | 2883 | incdec_x.step[0] = bspeed; |
@@ -2894,7 +2894,7 @@ static void goto_menu(void) | |||
2894 | case MAIN_MENU_GRID_SIZE: | 2894 | case MAIN_MENU_GRID_SIZE: |
2895 | for(multi = 0; multi<4; multi++) | 2895 | for(multi = 0; multi<4; multi++) |
2896 | if(gridsize == gridsize_list[multi]) break; | 2896 | if(gridsize == gridsize_list[multi]) break; |
2897 | rb->set_option( "Grid Size", &multi, INT, gridsize_options, 4, NULL ); | 2897 | rb->set_option( "Grid Size", &multi, RB_INT, gridsize_options, 4, NULL ); |
2898 | if( multi >= 0 ) | 2898 | if( multi >= 0 ) |
2899 | gridsize = gridsize_list[multi]; | 2899 | gridsize = gridsize_list[multi]; |
2900 | break; | 2900 | break; |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 7a43b235b7..c71fa7f247 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -1599,7 +1599,7 @@ static void game_init(void) | |||
1599 | speed = level*20; | 1599 | speed = level*20; |
1600 | return; | 1600 | return; |
1601 | case 1: | 1601 | case 1: |
1602 | rb->set_option("Game Type", &game_type, INT, | 1602 | rb->set_option("Game Type", &game_type, RB_INT, |
1603 | type_options, 2, NULL); | 1603 | type_options, 2, NULL); |
1604 | break; | 1604 | break; |
1605 | case 2: | 1605 | case 2: |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 874d872d95..fde3d04a0b 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -1088,7 +1088,7 @@ static int solitaire_menu(bool in_game) | |||
1088 | 1088 | ||
1089 | case 2: | 1089 | case 2: |
1090 | if (rb->set_option("Draw Cards Option", &sol.draw_type, | 1090 | if (rb->set_option("Draw Cards Option", &sol.draw_type, |
1091 | INT, drawcards, 2, NULL)) | 1091 | RB_INT, drawcards, 2, NULL)) |
1092 | result = MENU_USB; | 1092 | result = MENU_USB; |
1093 | break; | 1093 | break; |
1094 | 1094 | ||
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 34a1f6dd07..3ede4e8af6 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -867,7 +867,7 @@ static bool numdisplay_setting(void) | |||
867 | {"Coloured", -1}, | 867 | {"Coloured", -1}, |
868 | }; | 868 | }; |
869 | 869 | ||
870 | return rb->set_option("Number Display", &sudcfg.number_display, INT, names, | 870 | return rb->set_option("Number Display", &sudcfg.number_display, RB_INT, names, |
871 | sizeof(names) / sizeof(names[0]), NULL); | 871 | sizeof(names) / sizeof(names[0]), NULL); |
872 | } | 872 | } |
873 | #endif | 873 | #endif |
@@ -880,7 +880,7 @@ static bool showmarkings_setting(void) | |||
880 | {"Show", -1}, | 880 | {"Show", -1}, |
881 | }; | 881 | }; |
882 | 882 | ||
883 | return rb->set_option("Show Markings", &sudcfg.show_markings, INT, names, | 883 | return rb->set_option("Show Markings", &sudcfg.show_markings, RB_INT, names, |
884 | sizeof(names) / sizeof(names[0]), NULL); | 884 | sizeof(names) / sizeof(names[0]), NULL); |
885 | } | 885 | } |
886 | #endif | 886 | #endif |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 6969f76165..79a6d1a8f2 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -583,7 +583,7 @@ static int settings_menu(void) | |||
583 | }; | 583 | }; |
584 | static int sel=1; | 584 | static int sel=1; |
585 | rb->set_option("Computer difficulty", &sel, | 585 | rb->set_option("Computer difficulty", &sel, |
586 | INT, difficulty_options, 3, NULL); | 586 | RB_INT, difficulty_options, 3, NULL); |
587 | superdom_settings.compdiff=sel+1; | 587 | superdom_settings.compdiff=sel+1; |
588 | break; | 588 | break; |
589 | } | 589 | } |
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c index ac0dbf1633..91599bfc5d 100644 --- a/apps/plugins/test_codec.c +++ b/apps/plugins/test_codec.c | |||
@@ -915,7 +915,7 @@ menu: | |||
915 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 915 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
916 | if (result == BOOST) | 916 | if (result == BOOST) |
917 | { | 917 | { |
918 | rb->set_option("Boosting", &boost, INT, | 918 | rb->set_option("Boosting", &boost, RB_INT, |
919 | boost_settings, 2, NULL); | 919 | boost_settings, 2, NULL); |
920 | goto menu; | 920 | goto menu; |
921 | } | 921 | } |
diff --git a/apps/plugins/test_sampr.c b/apps/plugins/test_sampr.c index c13392f069..3006faeea5 100644 --- a/apps/plugins/test_sampr.c +++ b/apps/plugins/test_sampr.c | |||
@@ -252,7 +252,7 @@ static void play_tone(bool volume_set) | |||
252 | else | 252 | else |
253 | #endif /* HAVE_VOLUME_IN_LIST */ | 253 | #endif /* HAVE_VOLUME_IN_LIST */ |
254 | { | 254 | { |
255 | rb->set_option("Sample Rate", &freq, INT, names, | 255 | rb->set_option("Sample Rate", &freq, RB_INT, names, |
256 | HW_NUM_FREQ, set_frequency); | 256 | HW_NUM_FREQ, set_frequency); |
257 | (void)volume_set; | 257 | (void)volume_set; |
258 | } | 258 | } |
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c index 1cc471e207..74a964ba98 100644 --- a/apps/plugins/text_viewer/tv_menu.c +++ b/apps/plugins/text_viewer/tv_menu.c | |||
@@ -46,7 +46,7 @@ static bool tv_horizontal_scroll_mode_setting(void) | |||
46 | {"Scroll by Column", -1}, | 46 | {"Scroll by Column", -1}, |
47 | }; | 47 | }; |
48 | 48 | ||
49 | return rb->set_option("Scroll Mode", &new_prefs.horizontal_scroll_mode, INT, | 49 | return rb->set_option("Scroll Mode", &new_prefs.horizontal_scroll_mode, RB_INT, |
50 | names, 2, NULL); | 50 | names, 2, NULL); |
51 | } | 51 | } |
52 | 52 | ||
@@ -75,7 +75,7 @@ static bool tv_vertical_scroll_mode_setting(void) | |||
75 | {"Scroll by Line", -1}, | 75 | {"Scroll by Line", -1}, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | return rb->set_option("Scroll Mode", &new_prefs.vertical_scroll_mode, INT, | 78 | return rb->set_option("Scroll Mode", &new_prefs.vertical_scroll_mode, RB_INT, |
79 | names, 2, NULL); | 79 | names, 2, NULL); |
80 | } | 80 | } |
81 | 81 | ||
@@ -97,7 +97,7 @@ static bool tv_narrow_mode_setting(void) | |||
97 | {"Top/Bottom Page", -1}, | 97 | {"Top/Bottom Page", -1}, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | return rb->set_option("Left/Right Key", &new_prefs.narrow_mode, INT, | 100 | return rb->set_option("Left/Right Key", &new_prefs.narrow_mode, RB_INT, |
101 | names, 2, NULL); | 101 | names, 2, NULL); |
102 | } | 102 | } |
103 | 103 | ||
@@ -138,7 +138,7 @@ static bool tv_encoding_setting(void) | |||
138 | names[idx].voice_id = -1; | 138 | names[idx].voice_id = -1; |
139 | } | 139 | } |
140 | 140 | ||
141 | return rb->set_option("Encoding", &new_prefs.encoding, INT, names, | 141 | return rb->set_option("Encoding", &new_prefs.encoding, RB_INT, names, |
142 | sizeof(names) / sizeof(names[0]), NULL); | 142 | sizeof(names) / sizeof(names[0]), NULL); |
143 | } | 143 | } |
144 | 144 | ||
@@ -149,7 +149,7 @@ static bool tv_word_wrap_setting(void) | |||
149 | {"Off (Chop Words)", -1}, | 149 | {"Off (Chop Words)", -1}, |
150 | }; | 150 | }; |
151 | 151 | ||
152 | return rb->set_option("Word Wrap", &new_prefs.word_mode, INT, | 152 | return rb->set_option("Word Wrap", &new_prefs.word_mode, RB_INT, |
153 | names, 2, NULL); | 153 | names, 2, NULL); |
154 | } | 154 | } |
155 | 155 | ||
@@ -162,7 +162,7 @@ static bool tv_line_mode_setting(void) | |||
162 | {"Reflow Lines", -1}, | 162 | {"Reflow Lines", -1}, |
163 | }; | 163 | }; |
164 | 164 | ||
165 | return rb->set_option("Line Mode", &new_prefs.line_mode, INT, names, | 165 | return rb->set_option("Line Mode", &new_prefs.line_mode, RB_INT, names, |
166 | sizeof(names) / sizeof(names[0]), NULL); | 166 | sizeof(names) / sizeof(names[0]), NULL); |
167 | } | 167 | } |
168 | 168 | ||
@@ -179,7 +179,7 @@ static bool tv_alignment_setting(void) | |||
179 | {"Right", -1}, | 179 | {"Right", -1}, |
180 | }; | 180 | }; |
181 | 181 | ||
182 | return rb->set_option("Alignment", &new_prefs.alignment, INT, | 182 | return rb->set_option("Alignment", &new_prefs.alignment, RB_INT, |
183 | names , 2, NULL); | 183 | names , 2, NULL); |
184 | } | 184 | } |
185 | 185 | ||
diff --git a/apps/plugins/theme_remove.c b/apps/plugins/theme_remove.c index f39d224868..6f5353f3f6 100644 --- a/apps/plugins/theme_remove.c +++ b/apps/plugins/theme_remove.c | |||
@@ -589,7 +589,7 @@ static bool option_menu(void) | |||
589 | { | 589 | { |
590 | struct remove_setting *setting = &remove_list[result]; | 590 | struct remove_setting *setting = &remove_list[result]; |
591 | int prev_option = setting->option; | 591 | int prev_option = setting->option; |
592 | if (rb->set_option(option_menu_[result], &setting->option, INT, | 592 | if (rb->set_option(option_menu_[result], &setting->option, RB_INT, |
593 | remove_names, NUM_REMOVE_OPTION, NULL)) | 593 | remove_names, NUM_REMOVE_OPTION, NULL)) |
594 | return true; | 594 | return true; |
595 | if (prev_option != setting->option) | 595 | if (prev_option != setting->option) |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 39deae6947..0dafd05845 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -668,7 +668,7 @@ static bool vu_meter_menu(void) | |||
668 | switch(rb->do_menu(&menu, &selection, NULL, false)) | 668 | switch(rb->do_menu(&menu, &selection, NULL, false)) |
669 | { | 669 | { |
670 | case 0: | 670 | case 0: |
671 | rb->set_option("Meter Type", &vumeter_settings.meter_type, INT, | 671 | rb->set_option("Meter Type", &vumeter_settings.meter_type, RB_INT, |
672 | meter_type_option, 2, NULL); | 672 | meter_type_option, 2, NULL); |
673 | break; | 673 | break; |
674 | 674 | ||
@@ -701,12 +701,12 @@ static bool vu_meter_menu(void) | |||
701 | case 3: | 701 | case 3: |
702 | if(vumeter_settings.meter_type==ANALOG) | 702 | if(vumeter_settings.meter_type==ANALOG) |
703 | { | 703 | { |
704 | rb->set_option("Decay Speed", &vumeter_settings.analog_decay, INT, | 704 | rb->set_option("Decay Speed", &vumeter_settings.analog_decay, RB_INT, |
705 | decay_speed_option, 7, NULL); | 705 | decay_speed_option, 7, NULL); |
706 | } | 706 | } |
707 | else | 707 | else |
708 | { | 708 | { |
709 | rb->set_option("Decay Speed", &vumeter_settings.digital_decay, INT, | 709 | rb->set_option("Decay Speed", &vumeter_settings.digital_decay, RB_INT, |
710 | decay_speed_option, 7, NULL); | 710 | decay_speed_option, 7, NULL); |
711 | } | 711 | } |
712 | break; | 712 | break; |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index abdb6a4725..7dd814bc08 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -2562,24 +2562,24 @@ enum plugin_status plugin_start(const void* parameter) | |||
2562 | case 3: | 2562 | case 3: |
2563 | switch(players) { | 2563 | switch(players) { |
2564 | case 0: | 2564 | case 0: |
2565 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote,INT, | 2565 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote, RB_INT, |
2566 | nokey_option, 1, NULL); | 2566 | nokey_option, 1, NULL); |
2567 | break; | 2567 | break; |
2568 | case 1: | 2568 | case 1: |
2569 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote,INT, | 2569 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote, RB_INT, |
2570 | key24_option, 2, NULL); | 2570 | key24_option, 2, NULL); |
2571 | break; | 2571 | break; |
2572 | case 2: | 2572 | case 2: |
2573 | #ifdef REMOTE | 2573 | #ifdef REMOTE |
2574 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote,INT, | 2574 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote, RB_INT, |
2575 | remote_option, 2, NULL); | 2575 | remote_option, 2, NULL); |
2576 | #else | 2576 | #else |
2577 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote,INT, | 2577 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote, RB_INT, |
2578 | key2_option, 1, NULL); | 2578 | key2_option, 1, NULL); |
2579 | #endif | 2579 | #endif |
2580 | break; | 2580 | break; |
2581 | case 3: | 2581 | case 3: |
2582 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote,INT, | 2582 | rb->set_option(rb->str(LANG_CONTROL_STYLE),&use_remote, RB_INT, |
2583 | remoteonly_option, 1, NULL); | 2583 | remoteonly_option, 1, NULL); |
2584 | break; | 2584 | break; |
2585 | } | 2585 | } |
@@ -2608,7 +2608,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
2608 | break; | 2608 | break; |
2609 | case 9: | 2609 | case 9: |
2610 | new_setting = 0; | 2610 | new_setting = 0; |
2611 | rb->set_option(rb->str(LANG_RESET), &new_setting, INT, noyes , 2, NULL); | 2611 | rb->set_option(rb->str(LANG_RESET), &new_setting, RB_INT, noyes , 2, NULL); |
2612 | if (new_setting == 1) | 2612 | if (new_setting == 1) |
2613 | default_settings(); | 2613 | default_settings(); |
2614 | break; | 2614 | break; |
diff --git a/apps/plugins/xworld/sys.c b/apps/plugins/xworld/sys.c index e20322258d..4a80152b70 100644 --- a/apps/plugins/xworld/sys.c +++ b/apps/plugins/xworld/sys.c | |||
@@ -206,7 +206,7 @@ static void do_video_settings(struct System* sys) | |||
206 | #else | 206 | #else |
207 | case 2: | 207 | case 2: |
208 | #endif | 208 | #endif |
209 | rb->set_option("Scaling", &sys->settings.scaling_quality, INT, scaling_settings, | 209 | rb->set_option("Scaling", &sys->settings.scaling_quality, RB_INT, scaling_settings, |
210 | #ifdef HAVE_LCD_COLOR | 210 | #ifdef HAVE_LCD_COLOR |
211 | 3 | 211 | 3 |
212 | #else | 212 | #else |
@@ -225,7 +225,7 @@ static void do_video_settings(struct System* sys) | |||
225 | #else | 225 | #else |
226 | case 3: | 226 | case 3: |
227 | #endif | 227 | #endif |
228 | rb->set_option("Rotation", &sys->settings.rotation_option, INT, rotation_settings, 3, NULL); | 228 | rb->set_option("Rotation", &sys->settings.rotation_option, RB_INT, rotation_settings, 3, NULL); |
229 | if(sys->settings.rotation_option && | 229 | if(sys->settings.rotation_option && |
230 | sys->settings.zoom) | 230 | sys->settings.zoom) |
231 | { | 231 | { |
diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c index 6c6b59c3fb..38cc175a85 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c | |||
@@ -257,21 +257,21 @@ static void options_menu(void){ | |||
257 | { | 257 | { |
258 | case 0: | 258 | case 0: |
259 | new_setting=settings.kempston; | 259 | new_setting=settings.kempston; |
260 | rb->set_option("Map Keys to kempston",&new_setting,INT, | 260 | rb->set_option("Map Keys to kempston",&new_setting, RB_INT, |
261 | no_yes, 2, NULL); | 261 | no_yes, 2, NULL); |
262 | if (new_setting != settings.kempston ) | 262 | if (new_setting != settings.kempston ) |
263 | settings.kempston=new_setting; | 263 | settings.kempston=new_setting; |
264 | break; | 264 | break; |
265 | case 1: | 265 | case 1: |
266 | new_setting = settings.showfps; | 266 | new_setting = settings.showfps; |
267 | rb->set_option("Display Speed",&new_setting,INT, | 267 | rb->set_option("Display Speed",&new_setting, RB_INT, |
268 | no_yes, 2, NULL); | 268 | no_yes, 2, NULL); |
269 | if (new_setting != settings.showfps ) | 269 | if (new_setting != settings.showfps ) |
270 | settings.showfps=new_setting; | 270 | settings.showfps=new_setting; |
271 | break; | 271 | break; |
272 | case 2: | 272 | case 2: |
273 | new_setting = settings.invert_colors; | 273 | new_setting = settings.invert_colors; |
274 | rb->set_option("Invert Colors",&new_setting,INT, | 274 | rb->set_option("Invert Colors",&new_setting, RB_INT, |
275 | no_yes, 2, NULL); | 275 | no_yes, 2, NULL); |
276 | if (new_setting != settings.invert_colors ) | 276 | if (new_setting != settings.invert_colors ) |
277 | settings.invert_colors=new_setting; | 277 | settings.invert_colors=new_setting; |
@@ -279,14 +279,14 @@ static void options_menu(void){ | |||
279 | break; | 279 | break; |
280 | case 3: | 280 | case 3: |
281 | new_setting = settings.frameskip; | 281 | new_setting = settings.frameskip; |
282 | rb->set_option("Frameskip",&new_setting,INT, | 282 | rb->set_option("Frameskip",&new_setting, RB_INT, |
283 | frameskip_items, 10, NULL); | 283 | frameskip_items, 10, NULL); |
284 | if (new_setting != settings.frameskip ) | 284 | if (new_setting != settings.frameskip ) |
285 | settings.frameskip=new_setting; | 285 | settings.frameskip=new_setting; |
286 | break; | 286 | break; |
287 | case 4: | 287 | case 4: |
288 | new_setting = settings.sound; | 288 | new_setting = settings.sound; |
289 | rb->set_option("Sound",&new_setting,INT, | 289 | rb->set_option("Sound",&new_setting, RB_INT, |
290 | no_yes, 2, NULL); | 290 | no_yes, 2, NULL); |
291 | if (new_setting != settings.sound ) | 291 | if (new_setting != settings.sound ) |
292 | settings.sound=new_setting; | 292 | settings.sound=new_setting; |
@@ -296,7 +296,7 @@ static void options_menu(void){ | |||
296 | break; | 296 | break; |
297 | case 5: | 297 | case 5: |
298 | new_setting = 9 - settings.volume; | 298 | new_setting = 9 - settings.volume; |
299 | rb->set_option("Volume",&new_setting,INT, | 299 | rb->set_option("Volume",&new_setting, RB_INT, |
300 | frameskip_items, 10, NULL); | 300 | frameskip_items, 10, NULL); |
301 | new_setting = 9 - new_setting; | 301 | new_setting = 9 - new_setting; |
302 | if (new_setting != settings.volume ) | 302 | if (new_setting != settings.volume ) |