From d0c6dfee0b4181303c1a85af9f9cab376736f012 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Wed, 5 Oct 2022 18:43:58 +0200 Subject: [PATCH] Cleanup bitmask setting --- input/drivers/android_input.c | 10 +- input/drivers/cocoa_input.c | 10 +- input/drivers/dinput.c | 16 +- input/drivers/gx_input.c | 12 +- input/drivers/linuxraw_input.c | 6 +- input/drivers/ps2_input.c | 3 +- input/drivers/ps3_input.c | 6 +- input/drivers/ps4_input.c | 6 +- input/drivers/psl1ght_input.c | 10 +- input/drivers/psp_input.c | 11 +- input/drivers/qnx_input.c | 10 +- input/drivers/rwebinput_input.c | 15 +- input/drivers/sdl_input.c | 17 +- input/drivers/switch_input.c | 13 +- input/drivers/udev_input.c | 10 +- input/drivers/uwp_input.c | 15 +- input/drivers/wayland_input.c | 10 +- input/drivers/wiiu_input.c | 8 +- input/drivers/winraw_input.c | 12 +- input/drivers/x11_input.c | 17 +- libretro-common/features/features_cpu.c | 18 +- menu/menu_displaylist.c | 309 ++++++++++++------------ 22 files changed, 252 insertions(+), 292 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 5c162f6668..4fd5cd11ee 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -1694,11 +1694,11 @@ static void android_input_free_input(void *data) static uint64_t android_input_get_capabilities(void *data) { return - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_POINTER) | - (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_LIGHTGUN) | - (1 << RETRO_DEVICE_ANALOG); + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_LIGHTGUN) + | (1 << RETRO_DEVICE_ANALOG); } static void android_input_enable_sensor_manager(struct android_app *android_app) diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 8a7e91c6fd..eedcb6716b 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -544,11 +544,11 @@ static void cocoa_input_free(void *data) static uint64_t cocoa_input_get_capabilities(void *data) { return - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_MOUSE) | - (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_POINTER) | - (1 << RETRO_DEVICE_ANALOG); + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_ANALOG); } input_driver_t input_cocoa = { diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index 03de80f37e..ab31879e9d 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -1027,16 +1027,12 @@ static void dinput_grab_mouse(void *data, bool state) static uint64_t dinput_get_capabilities(void *data) { - uint64_t caps = 0; - - caps |= (1 << RETRO_DEVICE_JOYPAD); - caps |= (1 << RETRO_DEVICE_MOUSE); - caps |= (1 << RETRO_DEVICE_KEYBOARD); - caps |= (1 << RETRO_DEVICE_LIGHTGUN); - caps |= (1 << RETRO_DEVICE_POINTER); - caps |= (1 << RETRO_DEVICE_ANALOG); - - return caps; + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_LIGHTGUN) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_ANALOG); } input_driver_t input_dinput = { diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c index 04079c8837..ccc3dce046 100644 --- a/input/drivers/gx_input.c +++ b/input/drivers/gx_input.c @@ -265,16 +265,16 @@ static void rvl_input_poll(void *data) static uint64_t rvl_input_get_capabilities(void *data) { - return (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG) | - (1 << RETRO_DEVICE_MOUSE) | - (1 << RETRO_DEVICE_LIGHTGUN); + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_LIGHTGUN); } #else static uint64_t gx_input_get_capabilities(void *data) { - return (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG); + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } #endif diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index 60a48c05f8..07b8954f43 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -54,8 +54,7 @@ static void *linuxraw_input_init(const char *joypad_driver) return NULL; } - linuxraw = (linuxraw_input_t*)calloc(1, sizeof(*linuxraw)); - if (!linuxraw) + if (!(linuxraw = (linuxraw_input_t*)calloc(1, sizeof(*linuxraw)))) return NULL; if (!linux_terminal_disable_input()) @@ -196,7 +195,8 @@ static void linuxraw_input_poll(void *data) static uint64_t linuxraw_get_capabilities(void *data) { - return (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG); + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } input_driver_t input_linuxraw = { diff --git a/input/drivers/ps2_input.c b/input/drivers/ps2_input.c index b58b3f687c..35d7d40afc 100644 --- a/input/drivers/ps2_input.c +++ b/input/drivers/ps2_input.c @@ -30,7 +30,8 @@ static void ps2_input_free_input(void *data) { } static void* ps2_input_initialize(const char *a) { return (void*)-1; } static uint64_t ps2_input_get_capabilities(void *data) { - return (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG); + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } input_driver_t input_ps2 = { diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index 41bee3a558..0e3239715e 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -170,10 +170,10 @@ static uint64_t ps3_input_get_capabilities(void *data) { return #ifdef HAVE_MOUSE - (1 << RETRO_DEVICE_MOUSE) | + (1 << RETRO_DEVICE_MOUSE) | #endif - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG); + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } static bool ps3_input_set_sensor_state(void *data, unsigned port, diff --git a/input/drivers/ps4_input.c b/input/drivers/ps4_input.c index a665bc5754..acb4578f8c 100644 --- a/input/drivers/ps4_input.c +++ b/input/drivers/ps4_input.c @@ -126,13 +126,13 @@ static void ps4_input_poll(void *data) if (ps4 && ps4->joypad) ps4->joypad->poll(); } + static uint64_t ps4_input_get_capabilities(void *data) { - return (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG); + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } - - input_driver_t input_ps4 = { ps4_input_initialize, ps4_input_poll, /* poll */ diff --git a/input/drivers/psl1ght_input.c b/input/drivers/psl1ght_input.c index f64d8c95b4..b2ab0b1d19 100644 --- a/input/drivers/psl1ght_input.c +++ b/input/drivers/psl1ght_input.c @@ -927,14 +927,14 @@ static uint64_t ps3_input_get_capabilities(void *data) { return #ifdef HAVE_MOUSE - (1 << RETRO_DEVICE_MOUSE) | + (1 << RETRO_DEVICE_MOUSE) | #endif #ifdef HAVE_LIGHTGUN - (1 << RETRO_DEVICE_LIGHTGUN) | + (1 << RETRO_DEVICE_LIGHTGUN) | #endif - (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG); + (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } static bool ps3_input_set_sensor_state(void *data, unsigned port, diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 2378d69760..75d52d6402 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -300,16 +300,15 @@ static void psp_input_free_input(void *data) free(data); } - static uint64_t psp_input_get_capabilities(void *data) { - uint64_t caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG); - + return #ifdef VITA - caps |= (1 << RETRO_DEVICE_KEYBOARD) | (1 << RETRO_DEVICE_MOUSE); + (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_MOUSE) | #endif - - return caps; + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } #ifdef VITA diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index 448c6dcbb4..cbf158bc34 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -833,15 +833,13 @@ static void qnx_input_free_input(void *data) static uint64_t qnx_input_get_capabilities(void *data) { - (void)data; - return - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_POINTER) | + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_POINTER) #ifdef HAVE_BB10 - (1 << RETRO_DEVICE_ANALOG) | + | (1 << RETRO_DEVICE_ANALOG) #endif - (1 << RETRO_DEVICE_KEYBOARD); + | (1 << RETRO_DEVICE_KEYBOARD); } input_driver_t input_qnx = { diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index 9facda33ff..a37d170680 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -668,15 +668,12 @@ static void rwebinput_grab_mouse(void *data, bool state) static uint64_t rwebinput_get_capabilities(void *data) { - uint64_t caps = 0; - - caps |= (1 << RETRO_DEVICE_JOYPAD); - caps |= (1 << RETRO_DEVICE_ANALOG); - caps |= (1 << RETRO_DEVICE_KEYBOARD); - caps |= (1 << RETRO_DEVICE_MOUSE); - caps |= (1 << RETRO_DEVICE_POINTER); - - return caps; + return + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_POINTER); } input_driver_t input_rwebinput = { diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index d6245b50ec..a0afcce19b 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -451,16 +451,13 @@ static void sdl_input_poll(void *data) static uint64_t sdl_get_capabilities(void *data) { - uint64_t caps = 0; - - caps |= (1 << RETRO_DEVICE_JOYPAD); - caps |= (1 << RETRO_DEVICE_MOUSE); - caps |= (1 << RETRO_DEVICE_KEYBOARD); - caps |= (1 << RETRO_DEVICE_LIGHTGUN); - caps |= (1 << RETRO_DEVICE_POINTER); - caps |= (1 << RETRO_DEVICE_ANALOG); - - return caps; + return + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_LIGHTGUN) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_ANALOG); } input_driver_t input_sdl = { diff --git a/input/drivers/switch_input.c b/input/drivers/switch_input.c index a8e5d14c0b..514f695cae 100644 --- a/input/drivers/switch_input.c +++ b/input/drivers/switch_input.c @@ -825,15 +825,14 @@ static void* switch_input_init(const char *joypad_driver) static uint64_t switch_input_get_capabilities(void *data) { - (void) data; - - uint64_t caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG); - + return #ifdef HAVE_LIBNX - caps |= (1 << RETRO_DEVICE_POINTER) | (1 << RETRO_DEVICE_KEYBOARD) | (1 << RETRO_DEVICE_MOUSE); + (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_MOUSE) | #endif - - return caps; + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG); } static bool switch_input_set_sensor_state(void *data, unsigned port, diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index f73da7e3c3..e8364e26ad 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -1496,11 +1496,11 @@ error: static uint64_t udev_input_get_capabilities(void *data) { return - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG) | - (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_MOUSE) | - (1 << RETRO_DEVICE_LIGHTGUN); + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_LIGHTGUN); } static void udev_input_grab_mouse(void *data, bool state) diff --git a/input/drivers/uwp_input.c b/input/drivers/uwp_input.c index 3fc8e26fe5..2c6918b866 100644 --- a/input/drivers/uwp_input.c +++ b/input/drivers/uwp_input.c @@ -39,15 +39,12 @@ static void *uwp_input_init(const char *a) static uint64_t uwp_input_get_capabilities(void *data) { - uint64_t caps = 0; - - caps |= (1 << RETRO_DEVICE_JOYPAD); - caps |= (1 << RETRO_DEVICE_MOUSE); - caps |= (1 << RETRO_DEVICE_KEYBOARD); - caps |= (1 << RETRO_DEVICE_POINTER); - caps |= (1 << RETRO_DEVICE_ANALOG); - - return caps; + return + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_ANALOG); } static int16_t uwp_input_state( diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c index f6b0022c72..96112f556c 100644 --- a/input/drivers/wayland_input.c +++ b/input/drivers/wayland_input.c @@ -401,11 +401,11 @@ bool input_wl_init(void *data, const char *joypad_name) static uint64_t input_wl_get_capabilities(void *data) { return - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG) | - (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_MOUSE) | - (1 << RETRO_DEVICE_LIGHTGUN); + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_LIGHTGUN); } static void input_wl_grab_mouse(void *data, bool state) diff --git a/input/drivers/wiiu_input.c b/input/drivers/wiiu_input.c index 48e39875a7..86303d5e52 100644 --- a/input/drivers/wiiu_input.c +++ b/input/drivers/wiiu_input.c @@ -152,10 +152,10 @@ static void* wiiu_input_init(const char *joypad_driver) static uint64_t wiiu_input_get_capabilities(void *data) { - return (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG) | - (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_POINTER); + return (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_POINTER); } input_driver_t input_wiiu = { diff --git a/input/drivers/winraw_input.c b/input/drivers/winraw_input.c index bcaecdd001..0cdc9ec5de 100644 --- a/input/drivers/winraw_input.c +++ b/input/drivers/winraw_input.c @@ -1052,12 +1052,12 @@ static void winraw_free(void *data) static uint64_t winraw_get_capabilities(void *u) { - return (1 << RETRO_DEVICE_KEYBOARD) | - (1 << RETRO_DEVICE_MOUSE) | - (1 << RETRO_DEVICE_JOYPAD) | - (1 << RETRO_DEVICE_ANALOG) | - (1 << RETRO_DEVICE_POINTER) | - (1 << RETRO_DEVICE_LIGHTGUN); + return (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_ANALOG) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_LIGHTGUN); } static void winraw_grab_mouse(void *d, bool state) diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c index a631b33d0c..6e59c45cfb 100644 --- a/input/drivers/x11_input.c +++ b/input/drivers/x11_input.c @@ -596,16 +596,13 @@ static void x_grab_mouse(void *data, bool state) static uint64_t x_input_get_capabilities(void *data) { - uint64_t caps = 0; - - caps |= (1 << RETRO_DEVICE_JOYPAD); - caps |= (1 << RETRO_DEVICE_MOUSE); - caps |= (1 << RETRO_DEVICE_KEYBOARD); - caps |= (1 << RETRO_DEVICE_LIGHTGUN); - caps |= (1 << RETRO_DEVICE_POINTER); - caps |= (1 << RETRO_DEVICE_ANALOG); - - return caps; + return + (1 << RETRO_DEVICE_JOYPAD) + | (1 << RETRO_DEVICE_MOUSE) + | (1 << RETRO_DEVICE_KEYBOARD) + | (1 << RETRO_DEVICE_LIGHTGUN) + | (1 << RETRO_DEVICE_POINTER) + | (1 << RETRO_DEVICE_ANALOG); } input_driver_t input_x = { diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c index 9da1cb9b87..306f228b98 100644 --- a/libretro-common/features/features_cpu.c +++ b/libretro-common/features/features_cpu.c @@ -627,17 +627,12 @@ uint64_t cpu_features_get(void) size_t len = sizeof(size_t); if (sysctlbyname("hw.optional.floatingpoint", NULL, &len, NULL, 0) == 0) - { cpu |= RETRO_SIMD_CMOV; - } #if defined(CPU_X86) len = sizeof(size_t); if (sysctlbyname("hw.optional.mmx", NULL, &len, NULL, 0) == 0) - { - cpu |= RETRO_SIMD_MMX; - cpu |= RETRO_SIMD_MMXEXT; - } + cpu |= RETRO_SIMD_MMX | RETRO_SIMD_MMXEXT; len = sizeof(size_t); if (sysctlbyname("hw.optional.sse", NULL, &len, NULL, 0) == 0) @@ -693,9 +688,7 @@ uint64_t cpu_features_get(void) cpu |= RETRO_SIMD_VFPV4; #endif #elif defined(_XBOX1) - cpu |= RETRO_SIMD_MMX; - cpu |= RETRO_SIMD_SSE; - cpu |= RETRO_SIMD_MMXEXT; + cpu |= RETRO_SIMD_MMX | RETRO_SIMD_SSE | RETRO_SIMD_MMXEXT; #elif defined(CPU_X86) unsigned max_flag = 0; int flags[4]; @@ -729,12 +722,9 @@ uint64_t cpu_features_get(void) if (flags[3] & (1 << 23)) cpu |= RETRO_SIMD_MMX; + /* SSE also implies MMXEXT (according to FFmpeg source). */ if (flags[3] & (1 << 25)) - { - /* SSE also implies MMXEXT (according to FFmpeg source). */ - cpu |= RETRO_SIMD_SSE; - cpu |= RETRO_SIMD_MMXEXT; - } + cpu |= RETRO_SIMD_SSE | RETRO_SIMD_MMXEXT; if (flags[3] & (1 << 26)) cpu |= RETRO_SIMD_SSE2; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 19541229d5..18ef621872 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -10961,24 +10961,24 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, } } #endif - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_NETPLAY_KICK_LIST: #ifdef HAVE_NETWORKING menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_netplay_kick(info->list); #endif - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_NETPLAY_BAN_LIST: #ifdef HAVE_NETWORKING menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_netplay_ban(info->list); #endif - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_OPTIONS_REMAPPINGS_PORT: { @@ -11137,8 +11137,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, } } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; if (selection >= count) info->flags |= MD_FLAG_NEED_CLEAR; } @@ -11384,9 +11384,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; } case DISPLAYLIST_LOAD_DISC: @@ -11401,9 +11401,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; #else case DISPLAYLIST_CDROM_DETAIL_INFO: @@ -11434,9 +11434,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_CPU_POLICY_GOVERNOR, MENU_SETTINGS_CPU_POLICY_SET_GOVERNOR, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; case DISPLAYLIST_CPU_PERFPOWER_LIST: { @@ -11507,9 +11507,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, }; } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; } #endif @@ -11573,9 +11573,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; } #if defined(HAVE_LAKKA_SWITCH) @@ -11614,9 +11614,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, count++; } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; } #endif /* HAVE_LAKKA_SWITCH */ @@ -11677,9 +11677,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ITEMS, MENU_SETTING_NO_ITEM, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; case DISPLAYLIST_MIXER_STREAM_SETTINGS_LIST: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -11756,9 +11756,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; break; case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST: /* TODO/FIXME ? */ @@ -11784,8 +11784,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_DATABASE_ENTRY: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -11873,9 +11873,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_SORT + | MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_OPTIONS_SHADERS: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -12025,9 +12025,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; #endif break; case DISPLAYLIST_CORE_CONTENT_DIRS_SUBDIR: @@ -12056,9 +12056,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; string_list_deinitialize(&str_list); #endif @@ -12084,9 +12084,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; #endif } break; @@ -12104,9 +12104,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; #endif break; case DISPLAYLIST_CORES_UPDATER: @@ -12189,8 +12189,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_THUMBNAILS_UPDATER: #ifdef HAVE_NETWORKING @@ -12206,9 +12206,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; #endif break; case DISPLAYLIST_PL_THUMBNAILS_UPDATER: @@ -12224,9 +12224,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; #endif break; case DISPLAYLIST_LAKKA: @@ -12243,9 +12243,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_CLEAR; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_CLEAR; #endif break; case DISPLAYLIST_PLAYLIST_COLLECTION: @@ -12302,8 +12302,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } } break; @@ -12335,8 +12335,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; if (history_needs_navigation_clear(menu, g_defaults.content_history)) info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; break; @@ -12371,8 +12371,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } break; case DISPLAYLIST_MUSIC_HISTORY: @@ -12410,8 +12410,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; if (history_needs_navigation_clear(menu, g_defaults.music_history)) info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; } @@ -12457,8 +12457,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; #if (defined(HAVE_FFMPEG) || defined(HAVE_MPV)) if (history_needs_navigation_clear(menu, g_defaults.video_history)) info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; @@ -12470,16 +12470,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); rcheevos_menu_populate_hardcore_pause_submenu(info); #endif - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_ACHIEVEMENT_LIST: #ifdef HAVE_CHEEVOS menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); rcheevos_menu_populate(info); #endif - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_CORES_SUPPORTED: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -12490,8 +12490,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_DETECT_CORE_LIST_OK_CURRENT_CORE); info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_CORES_COLLECTION_SUPPORTED: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -12502,8 +12502,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION_CURRENT_CORE); info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; core_selected = true; break; case DISPLAYLIST_CORE_INFO: @@ -12521,37 +12521,31 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * current selection index is less than the current * number of menu entries - if not, we reset the * navigation pointer */ - size_t selection = menu_navigation_get_selection(); + size_t selection = menu_navigation_get_selection(); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_core_info(info, settings); if (selection >= count) - { - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; - } - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_NAVIGATION_CLEAR; + info->flags |= MD_FLAG_NEED_PUSH; } break; case DISPLAYLIST_CORE_RESTORE_BACKUP_LIST: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - { - count = menu_displaylist_parse_core_backup_list( - info, settings, true); - } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + count = menu_displaylist_parse_core_backup_list( + info, settings, true); + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_CORE_DELETE_BACKUP_LIST: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - { - count = menu_displaylist_parse_core_backup_list( - info, settings, false); - } - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + count = menu_displaylist_parse_core_backup_list( + info, settings, false); + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_NAVIGATION_CLEAR; break; case DISPLAYLIST_CORE_MANAGER_LIST: { @@ -12563,12 +12557,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, static size_t prev_count = 0; size_t selection = menu_navigation_get_selection(); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - count = menu_displaylist_parse_core_manager_list(info, - settings); + count = menu_displaylist_parse_core_manager_list + (info, settings); if (count == 0) menu_entries_append(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY), + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY), msg_hash_to_str(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY), MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0, NULL); @@ -12576,11 +12571,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, if ((count != prev_count) || (selection >= count)) { - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; - prev_count = count; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_NAVIGATION_CLEAR; + prev_count = count; } - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_PUSH; } break; #ifdef HAVE_MIST @@ -12588,8 +12583,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_core_manager_steam_list(info, settings); info->flags &= ~MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; + info->flags |= MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_NAVIGATION_CLEAR; /* No core dlcs were found */ if (count == 0) @@ -12605,8 +12600,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); info->flags &= ~MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; + info->flags |= MD_FLAG_NEED_PUSH + | MD_FLAG_NEED_NAVIGATION_CLEAR; count = menu_displaylist_parse_core_information_steam(info, settings); @@ -12814,10 +12809,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTINGS_CORE_OPTION_NONE, 0, 0, NULL); if (selection >= count) - { - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; - } + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_NAVIGATION_CLEAR; info->flags |= MD_FLAG_NEED_PUSH; } break; @@ -12837,10 +12830,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, count = menu_displaylist_parse_core_option_override_list(info, settings); if (selection >= count) - { - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; - } + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_NAVIGATION_CLEAR; info->flags |= MD_FLAG_NEED_PUSH; } break; @@ -12860,10 +12851,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, count = menu_displaylist_parse_remap_file_manager_list(info, settings); if (selection >= count) - { - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; - } + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_NAVIGATION_CLEAR; info->flags |= MD_FLAG_NEED_PUSH; } break; @@ -12939,8 +12928,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTINGS_SHADER_PARAMETER_0, MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PARAM); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_PRESET_PARAMETER: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -12949,39 +12938,39 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, info, info->list, info->type, MENU_SETTINGS_SHADER_PRESET_PARAMETER_0, MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PRESET_PARAM); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_DROPDOWN_LIST_INPUT_DEVICE_TYPE: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_input_device_type_list(info, settings); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_DROPDOWN_LIST_INPUT_DEVICE_INDEX: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_input_device_index_list(info, settings); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_DROPDOWN_LIST_INPUT_DESCRIPTION: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_input_description_list(info, settings); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_DROPDOWN_LIST_INPUT_DESCRIPTION_KBD: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_input_description_kbd_list(info, settings); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; #ifdef HAVE_NETWORKING case DISPLAYLIST_DROPDOWN_LIST_NETPLAY_MITM_SERVER: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_parse_netplay_mitm_server_list(info, settings); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; #endif case DISPLAYLIST_SAVING_SETTINGS_LIST: @@ -13169,8 +13158,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, } } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; /* Special pass */ switch (type) @@ -13194,15 +13183,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); ret = menu_displaylist_parse_horizontal_content_actions (menu, settings, info); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; if (core_selected) { @@ -13510,8 +13499,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, 0, 0, 0, NULL); ret = 0; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_MAIN_MENU: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -13746,8 +13735,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, strlcpy(lbl, temp_val, sizeof(lbl)); ret = MENU_DISPLAYLIST_PARSE_SETTINGS(info->list, lbl, PARSE_NONE, true, MENU_SETTINGS_INPUT_BEGIN); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } break; case DISPLAYLIST_DATABASES: @@ -13888,8 +13877,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } break; case DISPLAYLIST_IMAGES_HISTORY: @@ -13929,8 +13918,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, * > Display lists generated from playlists * must never be sorted */ info->flags &= ~MD_FLAG_NEED_SORT; - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; #if defined(HAVE_IMAGEVIEWER) if (history_needs_navigation_clear(menu, g_defaults.image_history)) info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; @@ -14065,8 +14054,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_PLAYLISTS, MENU_SETTING_NO_ITEM, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } break; case DISPLAYLIST_CORES: @@ -14096,8 +14085,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_NO_ITEMS, MENU_SETTING_NO_ITEM, 0, 0, NULL); - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) info->flags |= MD_FLAG_PUSH_BUILTIN_CORES; @@ -14439,8 +14428,8 @@ setting->max : 9999.00f; } } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } break; case DISPLAYLIST_DROPDOWN_LIST_VIDEO_SHADER_NUM_PASSES: @@ -14473,8 +14462,8 @@ setting->max : 9999.00f; } } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } #endif break; @@ -14770,8 +14759,8 @@ setting->max : 9999.00f; } } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; break; case DISPLAYLIST_NONE: break; @@ -14819,8 +14808,8 @@ setting->max : 9999.00f; } } - info->flags |= MD_FLAG_NEED_REFRESH; - info->flags |= MD_FLAG_NEED_PUSH; + info->flags |= MD_FLAG_NEED_REFRESH + | MD_FLAG_NEED_PUSH; } if (ret != 0)