diff --git a/audio/audio_driver.c b/audio/audio_driver.c index f5297309e7..2ab4048b0a 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -1688,6 +1688,14 @@ error: return false; } +const char *audio_driver_get_ident(void) +{ + audio_driver_state_t *audio_st = &audio_driver_st; + if (!audio_st->current_audio) + return NULL; + return audio_st->current_audio->ident; +} + bool audio_driver_stop(void) { bool stopped; diff --git a/audio/audio_driver.h b/audio/audio_driver.h index d26b005562..3ef284d1ce 100644 --- a/audio/audio_driver.h +++ b/audio/audio_driver.h @@ -443,6 +443,8 @@ extern audio_driver_t audio_rwebaudio; audio_driver_state_t *audio_state_get_ptr(void); +const char *audio_driver_get_ident(void); + extern audio_driver_t *audio_drivers[]; RETRO_END_DECLS diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 8ec65de5ae..229910ed20 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -9669,7 +9669,7 @@ static bool setting_append_list_input_player_options( MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_DEVICE_RESERVED_DEVICE_NAME + user)); - MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_VALUE_IDX(list, list_info, + MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_VALUE_IDX(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_RESERVED_DEVICE_NAME)); CONFIG_UINT_ALT( @@ -14703,7 +14703,7 @@ static bool setting_append_list( SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); #ifdef HAVE_WASAPI - if (string_is_equal(settings->arrays.audio_driver, "wasapi")) + if (string_is_equal(audio_driver_get_ident(), "wasapi")) { CONFIG_BOOL( list, list_info,