From b7a85d392fad6068ae6f7245182767305815788f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 12 Jul 2019 16:31:16 +0200 Subject: [PATCH] Silence warnings --- gfx/video_shader_parse.c | 2 ++ menu/cbs/menu_cbs_cancel.c | 8 +------- menu/cbs/menu_cbs_info.c | 2 ++ menu/cbs/menu_cbs_ok.c | 4 ++-- menu/menu_displaylist.c | 2 ++ menu/menu_setting.c | 4 ++-- retroarch.c | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index 12a274fd95..6b99d8d6b9 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -909,6 +909,8 @@ bool video_shader_is_supported(enum rarch_shader_type type) gfx_ctx_flags_t flags; enum display_flags testflag; + flags.flags = 0; + switch (type) { case RARCH_SHADER_SLANG: diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c index 8470677431..6fa4c04e03 100644 --- a/menu/cbs/menu_cbs_cancel.c +++ b/menu/cbs/menu_cbs_cancel.c @@ -36,14 +36,8 @@ int action_cancel_pop_default(const char *path, { size_t new_selection_ptr; const char *menu_label = NULL; - settings_t *settings = config_get_ptr(); - - (void)path; - (void)label; - (void)type; - (void)idx; - #ifdef HAVE_AUDIOMIXER + settings_t *settings = config_get_ptr(); if (settings->bools.audio_enable_menu && settings->bools.audio_enable_menu_cancel) audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_CANCEL); #endif diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c index ac3d407862..7ef42ade91 100644 --- a/menu/cbs/menu_cbs_info.c +++ b/menu/cbs/menu_cbs_info.c @@ -37,7 +37,9 @@ static int action_info_default(unsigned type, const char *label) menu_displaylist_info_t info; file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); size_t selection = menu_navigation_get_selection(); +#ifdef HAVE_AUDIOMIXER settings_t *settings = config_get_ptr(); +#endif menu_displaylist_info_init(&info); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 44ef9f9287..bcb70d50dc 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1314,9 +1314,9 @@ static int set_path_generic(const char *label, const char *action_path) static int generic_action_ok_command(enum event_command cmd) { +#ifdef HAVE_AUDIOMIXER settings_t *settings = config_get_ptr(); -#ifdef HAVE_AUDIOMIXER if (settings->bools.audio_enable_menu && settings->bools.audio_enable_menu_ok) audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_OK); #endif @@ -1392,9 +1392,9 @@ static int generic_action_ok(const char *path, const char *menu_label = NULL; const char *flush_char = NULL; menu_handle_t *menu = NULL; +#ifdef HAVE_AUDIOMIXER settings_t *settings = config_get_ptr(); -#ifdef HAVE_AUDIOMIXER if (settings->bools.audio_enable_menu && settings->bools.audio_enable_menu_ok) audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_OK); #endif diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index f9caada9b4..d00a95d362 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -6562,7 +6562,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, } case DISPLAYLIST_AUDIO_MIXER_SETTINGS_LIST: { +#ifdef HAVE_AUDIOMIXER unsigned i; +#endif menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); #ifdef HAVE_AUDIOMIXER diff --git a/menu/menu_setting.c b/menu/menu_setting.c index e0f98aa69d..7ebc8aa711 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4166,10 +4166,10 @@ static int setting_uint_action_left_custom_viewport_height( return 0; } +#if !defined(RARCH_CONSOLE) static int setting_string_action_left_audio_device( rarch_setting_t *setting, bool wraparound) { -#if !defined(RARCH_CONSOLE) int audio_device_index; struct string_list *ptr = NULL; @@ -4189,10 +4189,10 @@ static int setting_string_action_left_audio_device( audio_device_index = (int)(ptr->size - 1); strlcpy(setting->value.target.string, ptr->elems[audio_device_index].data, setting->size); -#endif return 0; } +#endif static int setting_string_action_left_driver(rarch_setting_t *setting, bool wraparound) diff --git a/retroarch.c b/retroarch.c index 9d5572779b..1919f6f621 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1357,7 +1357,9 @@ typedef struct input_remote_state uint64_t buttons[MAX_USERS]; } input_remote_state_t; +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) static input_remote_state_t remote_st_ptr; +#endif /* INPUT OVERLAY GLOBAL VARIABLES */ #ifdef HAVE_OVERLAY @@ -14804,10 +14806,6 @@ bool video_driver_texture_unload(uintptr_t *id) void video_driver_build_info(video_frame_info_t *video_info) { - bool is_perfcnt_enable = false; - bool is_paused = false; - bool is_idle = false; - bool is_slowmotion = false; video_viewport_t *custom_vp = NULL; struct retro_hw_render_callback *hwr = video_driver_get_hw_context_internal(); @@ -18153,7 +18151,9 @@ bool retroarch_main_init(int argc, char *argv[]) { settings_t *settings = configuration_settings; enum rarch_content_type cont_type = path_is_media_type(fullpath); +#ifdef HAVE_IMAGEVIEWER bool builtin_imageviewer = settings ? settings->bools.multimedia_builtin_imageviewer_enable : false; +#endif bool builtin_mediaplayer = settings ? settings->bools.multimedia_builtin_mediaplayer_enable : false; switch (cont_type)