Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save state logging and label unifications #17384

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Save state logging and label unifications #17384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,11 +1275,11 @@ bool command_event_save_auto_state(void)
sizeof(savestate_name_auto) - _len);

if (content_auto_save_state((const char*)savestate_name_auto))
RARCH_LOG("%s \"%s\" %s.\n",
RARCH_LOG("[State]: %s \"%s\" %s.\n",
msg_hash_to_str(MSG_AUTO_SAVE_STATE_TO),
savestate_name_auto, "succeeded");
else
RARCH_LOG("%s \"%s\" %s.\n",
RARCH_LOG("[State]: %s \"%s\" %s.\n",
msg_hash_to_str(MSG_AUTO_SAVE_STATE_TO),
savestate_name_auto, "failed");

Expand Down Expand Up @@ -1582,8 +1582,8 @@ static void scan_states(settings_t *settings,
loa_idx = gap_idx - 1;
}

RARCH_DBG("[State]: savestate scanning finished, used slots (in range): "
"%d (%d), max:%d, load index %d, gap index %d, delete index %d\n",
RARCH_DBG("[State]: Save state scanning finished, used slots (in range): "
"%d (%d), max:%d, load index %d, gap index %d, delete index %d.\n",
cnt, cnt_in_range, max_idx, loa_idx, gap_idx, del_idx);

if (last_index)
Expand Down Expand Up @@ -1636,7 +1636,7 @@ void command_event_set_savestate_auto_index(settings_t *settings)
return;
scan_states(settings, &max_idx, NULL);
configuration_set_int(settings, settings->ints.state_slot, max_idx);
RARCH_LOG("[State]: %s: #%d\n",
RARCH_LOG("[State]: %s: #%d.\n",
msg_hash_to_str(MSG_FOUND_LAST_STATE_SLOT),
max_idx);
}
Expand All @@ -1658,13 +1658,13 @@ static void command_event_set_savestate_garbage_collect(settings_t *settings)
if (!string_is_empty(state_to_delete))
{
filestream_delete(state_to_delete);
RARCH_DBG("[State]: garbage collect, deleting \"%s\" \n",state_to_delete);
RARCH_DBG("[State]: Garbage collect, deleting \"%s\".\n",state_to_delete);
/* Construct the save state thumbnail name
* and delete that one as well. */
i = strlen(state_to_delete);
strlcpy(state_to_delete + i,".png",STRLEN_CONST(".png")+1);
filestream_delete(state_to_delete);
RARCH_DBG("[State]: garbage collect, deleting \"%s\" \n",state_to_delete);
RARCH_DBG("[State]: Garbage collect, deleting \"%s\".\n",state_to_delete);
}
}

Expand Down Expand Up @@ -2137,12 +2137,12 @@ bool command_event_main_state(unsigned cmd)
input_driver_state_t *input_st = input_state_get_ptr();
if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_RECORDING)
{
RARCH_ERR("[Load] [Movie] Can't undo load state during movie record\n");
RARCH_ERR("[State]: Can't undo load state during movie record.\n");
return false;
}
if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_PLAYBACK)
{
RARCH_LOG("[Load] [Movie] Undo load state during movie playback, halting playback\n");
RARCH_LOG("[State]: Undo load state during movie playback, halting playback.\n");
movie_stop(input_st);
}
#endif
Expand Down
14 changes: 7 additions & 7 deletions intl/msg_hash_us.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CORE_INFO_SAVESTATE_BYPASS,
"Specifies whether to ignore core info savestate capabilities, allowing to experiment with related features (run ahead, rewind, etc)."
"Specifies whether to ignore core info save state capabilities, allowing to experiment with related features (run ahead, rewind, etc)."
)
#ifndef HAVE_DYNAMIC
MSG_HASH(
Expand Down Expand Up @@ -4873,7 +4873,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SAVESTATE_AUTO_SAVE,
"Automatically make a save state when content is closed. RetroArch will automatically load this save state if 'Load State Automatically' is enabled."
"Automatically make a save state when content is closed. This save state is loaded on startup if 'Auto Load State' is enabled."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD,
Expand Down Expand Up @@ -14175,10 +14175,6 @@ MSG_HASH(
MSG_AUTODETECT,
"Autodetect"
)
MSG_HASH(
MSG_AUTOLOADING_SAVESTATE_FROM,
"Auto-loading save state from"
)
MSG_HASH(
MSG_CAPABILITIES,
"Capabilities"
Expand Down Expand Up @@ -15275,6 +15271,10 @@ MSG_HASH(
MSG_VIRTUAL_DISK_TRAY_CLOSE,
"Failed to close virtual disc tray."
)
MSG_HASH(
MSG_AUTOLOADING_SAVESTATE_FROM,
"Auto-loading save state from"
)
MSG_HASH(
MSG_AUTOLOADING_SAVESTATE_FAILED,
"Auto-loading save state from \"%s\" failed."
Expand Down Expand Up @@ -16559,7 +16559,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_SUBLABEL_BOTTOM_FONT_ENABLE,
"Display bottom menu font. Enable to display button descriptions on the bottom screen. This excludes the savestate date."
"Display bottom menu font. Enable to display button descriptions on the bottom screen. This excludes the save state date."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_BOTTOM_FONT_COLOR_RED,
Expand Down
Loading