diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2023-09-22 10:30:25 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2023-09-22 10:31:00 -0400 |
commit | 74ded2bdd7ec6e65ccef65356c2482ee37c7095d (patch) | |
tree | 3f764211b09b307822020c09b3aafc46ea1b4aa7 | |
parent | 8cc3266b2a172a51dc12d05e8e1a06485b895e48 (diff) | |
download | rockbox-74ded2bdd7ec6e65ccef65356c2482ee37c7095d.tar.gz rockbox-74ded2bdd7ec6e65ccef65356c2482ee37c7095d.zip |
settings: Fix up the remaining stragglers from 8cc3266b
Change-Id: I20e98d1e7cf13a59194f62935a8f46e96f83a1f9
-rw-r--r-- | apps/menus/display_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index f43ae5691f..c5c5e6d908 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -515,7 +515,7 @@ static bool history_interval(void) | |||
515 | 515 | ||
516 | return set_option(str(LANG_HISTOGRAM_INTERVAL), | 516 | return set_option(str(LANG_HISTOGRAM_INTERVAL), |
517 | &global_settings.histogram_interval, | 517 | &global_settings.histogram_interval, |
518 | INT, names, 4, NULL ); | 518 | RB_INT, names, 4, NULL ); |
519 | } | 519 | } |
520 | 520 | ||
521 | MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), | 521 | MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 6fd1de8834..d47a315d87 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -329,11 +329,11 @@ static int agc_preset_func(void) | |||
329 | if (global_settings.rec_source) | 329 | if (global_settings.rec_source) |
330 | return set_option(str(LANG_RECORDING_AGC_PRESET), | 330 | return set_option(str(LANG_RECORDING_AGC_PRESET), |
331 | &global_settings.rec_agc_preset_line, | 331 | &global_settings.rec_agc_preset_line, |
332 | INT, names, 6, NULL ); | 332 | RB_INT, names, 6, NULL ); |
333 | else | 333 | else |
334 | return set_option(str(LANG_RECORDING_AGC_PRESET), | 334 | return set_option(str(LANG_RECORDING_AGC_PRESET), |
335 | &global_settings.rec_agc_preset_mic, | 335 | &global_settings.rec_agc_preset_mic, |
336 | INT, names, 6, NULL ); | 336 | RB_INT, names, 6, NULL ); |
337 | } | 337 | } |
338 | 338 | ||
339 | static int agc_cliptime_func(void) | 339 | static int agc_cliptime_func(void) |
@@ -347,7 +347,7 @@ static int agc_cliptime_func(void) | |||
347 | }; | 347 | }; |
348 | return set_option(str(LANG_RECORDING_AGC_CLIPTIME), | 348 | return set_option(str(LANG_RECORDING_AGC_CLIPTIME), |
349 | &global_settings.rec_agc_cliptime, | 349 | &global_settings.rec_agc_cliptime, |
350 | INT, names, 5, NULL ); | 350 | RB_INT, names, 5, NULL ); |
351 | } | 351 | } |
352 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), | 352 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), |
353 | agc_preset_func, NULL, Icon_Menu_setting); | 353 | agc_preset_func, NULL, Icon_Menu_setting); |
@@ -380,7 +380,7 @@ static enum themable_icons trigger_get_icon(int selected_item, void * data) | |||
380 | static const char * trigger_get_name(int selected_item, void * data, | 380 | static const char * trigger_get_name(int selected_item, void * data, |
381 | char * buffer, size_t buffer_len) | 381 | char * buffer, size_t buffer_len) |
382 | { | 382 | { |
383 | const struct settings_list **settings = | 383 | const struct settings_list **settings = |
384 | (const struct settings_list **)data; | 384 | (const struct settings_list **)data; |
385 | const struct settings_list *s = settings[selected_item / 2]; | 385 | const struct settings_list *s = settings[selected_item / 2]; |
386 | if ((selected_item % 2) == 0) /* header */ | 386 | if ((selected_item % 2) == 0) /* header */ |
@@ -493,7 +493,7 @@ int rectrigger(void) | |||
493 | /* restart trigger with new values */ | 493 | /* restart trigger with new values */ |
494 | settings_apply_trigger(); | 494 | settings_apply_trigger(); |
495 | peak_meter_trigger (global_settings.rec_trigger_mode != TRIG_MODE_OFF); | 495 | peak_meter_trigger (global_settings.rec_trigger_mode != TRIG_MODE_OFF); |
496 | 496 | ||
497 | trigger_speak_item(settings, 0, true); | 497 | trigger_speak_item(settings, 0, true); |
498 | 498 | ||
499 | while (!done) | 499 | while (!done) |
@@ -505,7 +505,7 @@ int rectrigger(void) | |||
505 | settings_apply_trigger(); | 505 | settings_apply_trigger(); |
506 | changed = false; | 506 | changed = false; |
507 | } | 507 | } |
508 | 508 | ||
509 | FOR_NB_SCREENS(i) | 509 | FOR_NB_SCREENS(i) |
510 | screens[i].set_viewport(&triggervp[i]); | 510 | screens[i].set_viewport(&triggervp[i]); |
511 | peak_meter_draw_trig(trig_xpos, trig_ypos, trig_width, NB_SCREENS); | 511 | peak_meter_draw_trig(trig_xpos, trig_ypos, trig_width, NB_SCREENS); |