diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1549549eca..773255c4d7 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1637,13 +1637,13 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list) int controller; #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES) || defined(HAVE_OPENGL_CORE) gfx_ctx_ident_t ident_info; + const char *tmp_string = NULL; #endif char tmp[8192]; #ifdef ANDROID bool perms = false; #endif unsigned count = 0; - const char *tmp_string = NULL; const frontend_ctx_driver_t *frontend = frontend_get_ptr(); const char *menu_driver = menu_driver_ident(); size_t len = strlcpy(tmp, diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 7e77b4d6bb..b87313fd2a 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -4141,6 +4141,7 @@ void get_current_menu_value(struct menu_state *menu_st, strlcpy(s, entry_label, len); } +#ifdef HAVE_ACCESSIBILITY static void menu_driver_get_current_menu_label(struct menu_state *menu_st, char *s, size_t len) { @@ -4162,6 +4163,7 @@ static void menu_driver_get_current_menu_label(struct menu_state *menu_st, strlcpy(s, entry_label, len); } +#endif static void menu_driver_get_current_menu_sublabel( struct menu_state *menu_st, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 26d52a6e8f..172d8ea136 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4846,6 +4846,7 @@ static void setting_get_string_representation_int_audio_wasapi_sh_buffer_length( } #endif +#if !defined(RARCH_CONSOLE) static void setting_get_string_representation_string_audio_device(rarch_setting_t *setting, char *s, size_t len) { @@ -4857,6 +4858,7 @@ static void setting_get_string_representation_string_audio_device(rarch_setting_ else strlcpy(s, setting->value.target.string, len); } +#endif static void setting_get_string_representation_crt_switch_resolution_super( rarch_setting_t *setting, @@ -6428,6 +6430,7 @@ static void setting_get_string_representation_uint_autosave_interval( } #endif +#ifdef HAVE_BSV_MOVIE static void setting_get_string_representation_uint_replay_checkpoint_interval( rarch_setting_t *setting, char *s, size_t len) @@ -6443,6 +6446,7 @@ static void setting_get_string_representation_uint_replay_checkpoint_interval( else strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len); } +#endif #if defined(HAVE_NETWORKING) static void setting_get_string_representation_netplay_mitm_server( diff --git a/retroarch.c b/retroarch.c index d05602122c..ddd45e4582 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2499,11 +2499,10 @@ bool command_event(enum event_command cmd, void *data) return false; case CMD_EVENT_PLAY_REPLAY: { - bool res = false; #ifdef HAVE_BSV_MOVIE input_driver_state_t *input_st = input_state_get_ptr(); char replay_path[PATH_MAX_LENGTH]; - res = true; + bool res = true; /* TODO: Consider extending the current replay if we start recording during a playback */ if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_RECORDING) res = false; @@ -2513,7 +2512,7 @@ bool command_event(enum event_command cmd, void *data) res = false; if (res) res = movie_start_playback(input_st, replay_path); - if(!res) + if (!res) { const char *movie_fail_str = msg_hash_to_str(MSG_FAILED_TO_LOAD_MOVIE_FILE); @@ -2529,14 +2528,13 @@ bool command_event(enum event_command cmd, void *data) } case CMD_EVENT_RECORD_REPLAY: { - bool res = false; #ifdef HAVE_BSV_MOVIE - input_driver_state_t *input_st = input_state_get_ptr(); - int replay_slot = settings->ints.replay_slot; char replay_path[PATH_MAX_LENGTH]; + bool res = true; + input_driver_state_t *input_st = input_state_get_ptr(); + int replay_slot = settings->ints.replay_slot; if (settings->bools.replay_auto_index) replay_slot += 1; - res = true; /* TODO: Consider cloning and extending the current replay if we start recording during a recording */ if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_RECORDING) res = false; @@ -2544,14 +2542,12 @@ bool command_event(enum event_command cmd, void *data) res = movie_stop(input_st); if (!runloop_get_replay_path(replay_path, sizeof(replay_path), replay_slot)) res = false; - if(res) + if (res) res = movie_start_record(input_st, replay_path); - if(res && settings->bools.replay_auto_index) - { + if (res && settings->bools.replay_auto_index) configuration_set_int(settings, settings->ints.replay_slot, replay_slot); - } - if(!res) + if (!res) { const char *movie_rec_fail_str = msg_hash_to_str(MSG_FAILED_TO_START_MOVIE_RECORD);