From 8cc3266b2a172a51dc12d05e8e1a06485b895e48 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 22 Sep 2023 09:57:48 -0400 Subject: Settings: Rename INT/BOOL setting type enum to RB_INT/RB_BOOL ....Because INT and BOOL are already defined in mingw32. Change-Id: I28ab8189c00002c8f68bc9d0c23d2ae78d9e33d0 --- apps/menus/recording_menu.c | 10 +++++----- apps/menus/time_menu.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 4d9f24d643..6fd1de8834 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -91,7 +91,7 @@ static int recsource_func(void) #endif return set_option(str(LANG_RECORDING_SOURCE), - &global_settings.rec_source, INT, names, + &global_settings.rec_source, RB_INT, names, n_opts, NULL ); } MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), @@ -171,7 +171,7 @@ static int recfrequency_func(void) } ret = set_option(str(LANG_FREQUENCY), - &rec_frequency, INT, opts, n_opts, NULL ); + &rec_frequency, RB_INT, opts, n_opts, NULL ); if (!ret HAVE_SPDIF_REC_( && global_settings.rec_source != REC_SRC_SPDIF) @@ -221,7 +221,7 @@ static int recchannels_func(void) make_options_from_indexes(names, table, n_opts, opts); ret = set_option(str(LANG_CHANNELS), &rec_channels, - INT, opts, n_opts, NULL ); + RB_INT, opts, n_opts, NULL ); if (!ret) global_settings.rec_channels = table[rec_channels]; @@ -241,7 +241,7 @@ static int recmonomode_func(void) int rec_mono_mode = global_settings.rec_mono_mode; bool ret = set_option(str(LANG_RECORDING_MONO_MODE), &rec_mono_mode, - INT, names, 3, NULL ); + RB_INT, names, 3, NULL ); if (rec_mono_mode != global_settings.rec_mono_mode) global_settings.rec_mono_mode = rec_mono_mode; @@ -261,7 +261,7 @@ static int recformat_func(void) }; int rec_format = global_settings.rec_format; - bool res = set_option(str(LANG_FORMAT), &rec_format, INT, + bool res = set_option(str(LANG_FORMAT), &rec_format, RB_INT, names, REC_NUM_FORMATS, NULL ); if (rec_format != global_settings.rec_format) diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index 6043573684..e6b5637047 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c @@ -135,7 +135,7 @@ static int alarm_setting(void) #endif return set_option(str(LANG_ALARM_WAKEUP_SCREEN), &global_settings.alarm_wake_up_screen, - INT, items, i, NULL); + RB_INT, items, i, NULL); } MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), -- cgit v1.2.3