Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-06-02 19:57:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replay nomenclature (#15054)

Browse source 
* change bsv file suffix to replay, update strings

* Fix bsv cli args

* Fix help whitespace

* Fix another message

---------

Co-authored-by: Joseph C. Osborn <jcoa2018@pomona.edu>
This commit is contained in:
Joe Osborn 2023-03-03 14:16:48 -08:00 committed by GitHub
parent a256a504a8
commit 4d81f70f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
command.c
View file

@ -1509,8 +1509,8 @@ void command_event_set_replay_auto_index(settings_t *settings)
/* Find the file in the same directory as runloop_st->names.replay
* with the largest numeral suffix.
*
* E.g. /foo/path/content.bsv, will try to find
* /foo/path/content.bsv%d, where %d is the largest number available.
* E.g. /foo/path/content.replay will try to find
* /foo/path/content.replay%d, where %d is the largest number available.
*/
fill_pathname_basedir(state_dir, runloop_st->name.replay,
sizeof(state_dir));
@ -1597,11 +1597,11 @@ void command_event_set_replay_garbage_collect(
fill_pathname_base(elem_base, dir_elem, sizeof(elem_base));
/* Only consider files with a '.bsvXX' extension
* > i.e. Ignore '.bsv.auto', '.bsv.bak', etc. */
/* Only consider files with a '.replayXX' extension
* > i.e. Ignore '.replay.auto', '.replay.bak', etc. */
ext = path_get_extension(elem_base);
if (string_is_empty(ext) ||
!string_starts_with_size(ext, "bsv", STRLEN_CONST("BSV")))
!string_starts_with_size(ext, "replay", STRLEN_CONST("REPLAY")))
continue;
/* Check whether this file is associated with

2
configuration.c
View file

@ -3860,7 +3860,7 @@ static bool config_load_file(global_t *global,
sizeof(runloop_st->name.replay));
fill_pathname_dir(runloop_st->name.replay,
path_get(RARCH_PATH_BASENAME),
".bsv",
".replay",
sizeof(runloop_st->name.replay));
}
else

10
docs/retroarch.6
View file

@ -150,13 +150,13 @@ Allows specifying the exact output width and height of recording. This option wi
The video input is scaled with point filtering before being encoded at the correct size.
.TP
\fB--bsvplay PATH, -P PATH\fR
Play back a movie recorded in the .bsv format (bsnes). Cart ROM and movie file need to correspond.
\fB--play-replay PATH, -P PATH\fR
Play back a movie recorded in the .replay format. Cart ROM and movie file need to correspond.
It also requires to play back with the same libretro backend that was used for recording.
.TP
\fB--bsvrecord PATH, -R PATH\fR
Start recording a .bsv video to PATH immediately after startup.
\fB--record-replay PATH, -R PATH\fR
Start recording a .replay video to PATH immediately after startup.
.TP
\fB--sram-mode MODE, -M MODE\fR
@ -190,7 +190,7 @@ Network port used for netplay. This defaults to 55435. This option affects both
\fB--spectate\fR
If netplay is used, it will go into a spectator mode.
Spectator mode allows one host to live stream game playback to multiple clients.
Essentially, clients receive a live streamed BSV movie file.
Essentially, clients receive a live streamed replay movie file.
Clients can connect and disconnect at any time.
Clients thus cannot interact as user 2.
For spectating mode to work, both host and clients will need to use this flag.

2
file_path_special.h
View file

@ -37,7 +37,7 @@ RETRO_BEGIN_DECLS
#define FILE_PATH_GLSLP_EXTENSION ".glslp"
#define FILE_PATH_SLANGP_EXTENSION ".slangp"
#define FILE_PATH_AUTO_EXTENSION ".auto"
#define FILE_PATH_BSV_EXTENSION ".bsv"
#define FILE_PATH_BSV_EXTENSION ".replay"
#define FILE_PATH_OPT_EXTENSION ".opt"
#define FILE_PATH_CORE_INFO_EXTENSION ".info"
#define FILE_PATH_CONFIG_EXTENSION ".cfg"

6
input/input_driver.c
View file

@ -4805,7 +4805,7 @@ void bsv_movie_next_frame(input_driver_state_t *input_st)
/* read next key events, a frame happened for sure? but don't apply them yet */
if (handle->key_event_count != 0)
{
RARCH_ERR("[Movie] BSV keyboard replay reading next frame while some unused keys still in queue\n");
RARCH_ERR("[Replay] Keyboard replay reading next frame while some unused keys still in queue\n");
}
if (intfstream_read(handle->file, &(handle->key_event_count), 1) == 1)
{
@ -4815,13 +4815,13 @@ void bsv_movie_next_frame(input_driver_state_t *input_st)
if (intfstream_read(handle->file, &(handle->key_events[i]), sizeof(bsv_key_data_t)) != sizeof(bsv_key_data_t))
{
/* Unnatural EOF */
RARCH_ERR("[Movie] BSV keyboard replay ran out of keyboard inputs too early\n");
RARCH_ERR("[Replay] Keyboard replay ran out of keyboard inputs too early\n");
}
}
}
else
{
RARCH_LOG("[Movie] EOF after buttons\n",handle->key_event_count);
RARCH_LOG("[Replay] EOF after buttons\n",handle->key_event_count);
/* Natural(?) EOF */
input_st->bsv_movie_state.flags |= BSV_FLAG_MOVIE_END;
}

2
intl/msg_hash_chs.c
View file

@ -1367,7 +1367,7 @@ int msg_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
" \n"
"所有游戏存档都保存在此文件夹。 \n"
"常见的游戏存档格式有 \n"
".srm, .bsv, .rt, .psrm 等\n"
".srm, .rt, .psrm 等\n"
" \n"
"此选项可能被特定命令行选项覆盖。");
break;

2
intl/msg_hash_cht.h
View file

@ -7414,7 +7414,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"儲存全部核心預設的記憶存檔到此資料夾。\n包含記憶存檔(*.srm)、 操作重播檔(*.bsv)、 實時時鐘(*.rtc)等相關檔案。\n此路徑位置會被命令列介面的命令取代。"
"儲存全部核心預設的記憶存檔到此資料夾。\n包含記憶存檔(*.srm)、 實時時鐘(*.rtc)等相關檔案。\n此路徑位置會被命令列介面的命令取代。"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_cs.h
View file

@ -7246,7 +7246,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Do tohoto adresáře uložte všechny ukládací soubory (*.srm). Patří sem i související soubory jako .bsv, .rt, .psrm atd... Toto bude potlačeno explicitními volbami příkazového řádku."
"Do tohoto adresáře uložte všechny ukládací soubory (*.srm). Patří sem i související soubory jako .rt, .psrm atd... Toto bude potlačeno explicitními volbami příkazového řádku."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_de.h
View file

@ -7162,7 +7162,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Speichert alle Speicherdaten (*.srm) in diesem Verzeichnis. Dies beinhaltet verwandte Dateitypen wie .bsv, .rt, .psrm usw. Explizite Kommandozeilenoptionen überschreiben diese Einstellung."
"Speichert alle Speicherdaten (*.srm) in diesem Verzeichnis. Dies beinhaltet verwandte Dateitypen wie .rt, .psrm usw. Explizite Kommandozeilenoptionen überschreiben diese Einstellung."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_es.h
View file

@ -7326,7 +7326,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Almacena todas las partidas guardadas (*.srm) en este directorio. Incluye los archivos relacionados, como .bsv, .rt, .psrm, etcétera. Este directorio será ignorado si se utilizan explícitamente opciones por línea de comandos."
"Almacena todas las partidas guardadas (*.srm) en este directorio. Incluye los archivos relacionados, como .rt, .psrm, etcétera. Este directorio será ignorado si se utilizan explícitamente opciones por línea de comandos."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_fr.h
View file

@ -7294,7 +7294,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Enregistrez tous les fichiers de sauvegarde (*.srm) dans ce dossier. Cela inclut les fichiers connexes comme .bsv, .rt, .psrm, etc... Peut être remplacé par des options en ligne de commande explicites."
"Enregistrez tous les fichiers de sauvegarde (*.srm) dans ce dossier. Cela inclut les fichiers connexes comme .rt, .psrm, etc... Peut être remplacé par des options en ligne de commande explicites."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_hu.h
View file

@ -7322,7 +7322,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Minden mentés fájl (*.srm) mentése ebbe a könyvtárba. Ez a .bsv, .rt, .psrm stb. fájlokat is tartalmazza. Parancssori opciókkal felülbírálható."
"Minden mentés fájl (*.srm) mentése ebbe a könyvtárba. Ez a .rt, .psrm stb. fájlokat is tartalmazza. Parancssori opciókkal felülbírálható."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_pt_br.c
View file

@ -1599,7 +1599,7 @@ int msg_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
" \n"
"Salvar todos os dados da memória do jogo (*.srm) \n"
"neste diretório. Isso inclui arquivos \n"
"relacionados, como .bsv, .rt, .psrm, etc... \n"
"relacionados, como .rt, .psrm, etc... \n"
" \n"
"Será substituído por opções definidas \n"
"explicitamente na linha de comando.");

2
intl/msg_hash_pt_pt.c
View file

@ -755,7 +755,7 @@ int msg_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
" \n"
"Guarda todos os ficheiros de gravação (*.srm) nesta \n"
"pasta, tais como ficheiros relacionados: \n"
".bsv, .rt, .psrm, etc.\n"
".rt, .psrm, etc.\n"
" \n"
"Pode perder prevalência em relação a opções explícitas\n"
"passadas como parâmetros na linha de comandos.");

2
intl/msg_hash_ru.h
View file

@ -7354,7 +7354,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Помещать все файлы сохранений (*.srm) в данный каталог. Включает связанные файлы .bsv, .rt, .psrm и т.д. Может переопределяться отдельными опциями командной строки."
"Помещать все файлы сохранений (*.srm) в данный каталог. Включает связанные файлы .rt, .psrm и т.д. Может переопределяться отдельными опциями командной строки."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,

2
intl/msg_hash_tr.c
View file

@ -1440,7 +1440,7 @@ int msg_hash_get_help_tr_enum(enum msg_hash_enums msg, char *s, size_t len)
" \n"
"Save all save files (*.srm) to this \n"
"directory. This includes related files like \n"
".bsv, .rt, .psrm, etc...\n"
".rt, .psrm, etc...\n"
" \n"
"This will be overridden by explicit command line\n"
"options.");

4
intl/msg_hash_us.h
View file

@ -7506,7 +7506,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_HELP_SAVEFILE_DIRECTORY,
"Save all save files (*.srm) to this directory. This includes related files like .bsv, .rt, .psrm, etc... This will be overridden by explicit command line options."
"Save all save files (*.srm) to this directory. This includes related files like .rt, .psrm, etc... This will be overridden by explicit command line options."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,
@ -7514,7 +7514,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SAVESTATE_DIRECTORY,
"Save states are stored in this directory. If not set, will attempt to save them to the directory where the content is located."
"Save states and replays are stored in this directory. If not set, will attempt to save them to the directory where the content is located."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY,

16
retroarch.c
View file

@ -5092,12 +5092,12 @@ static void retroarch_print_help(const char *arg0)
#ifdef HAVE_BSV_MOVIE
strlcat(buf,
" -P, --bsvplay=FILE "
"Playback a BSV movie file.\n"
" -R, --bsvrecord=FILE "
"Start recording a BSV movie file from the beginning.\n"
" -P, --play-replay=FILE "
"Playback a replay file.\n"
" -R, --record-replay=FILE "
"Start recording a replay file from the beginning.\n"
" --eof-exit "
"Exit upon reaching the end of the BSV movie file.\n"
"Exit upon reaching the end of the replay file.\n"
, sizeof(buf));
#endif
@ -5351,8 +5351,8 @@ static bool retroarch_parse_input_and_config(
{ "savestate", 1, NULL, 'S' },
{ "set-shader", 1, NULL, RA_OPT_SET_SHADER },
#ifdef HAVE_BSV_MOVIE
{ "bsvplay", 1, NULL, 'P' },
{ "bsvrecord", 1, NULL, 'R' },
{ "play-replay", 1, NULL, 'P' },
{ "record-replay", 1, NULL, 'R' },
#endif
{ "sram-mode", 1, NULL, 'M' },
#ifdef HAVE_NETWORKING
@ -5994,7 +5994,7 @@ static bool retroarch_parse_input_and_config(
if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_START_PLAYBACK)
{
runloop_st->entry_state_slot = 0;
RARCH_WARN("Trying to load entry state while BSV playback is active. Ignoring entry state.\n");
RARCH_WARN("Trying to load entry state while replay playback is active. Ignoring entry state.\n");
}
}
#endif

13
runloop.c
View file

@ -7727,10 +7727,13 @@ void runloop_path_set_names(void)
runloop_st->runtime_content_path_basename,
sizeof(runloop_st->name.replay));
runloop_st->name.replay[len ] = '.';
runloop_st->name.replay[len+1] = 'b';
runloop_st->name.replay[len+2] = 's';
runloop_st->name.replay[len+3] = 'v';
runloop_st->name.replay[len+4] = '\0';
runloop_st->name.replay[len+1] = 'r';
runloop_st->name.replay[len+2] = 'e';
runloop_st->name.replay[len+3] = 'p';
runloop_st->name.replay[len+4] = 'l';
runloop_st->name.replay[len+5] = 'a';
runloop_st->name.replay[len+6] = 'y';
runloop_st->name.replay[len+7] = '\0';
}
#endif
@ -8035,7 +8038,7 @@ void runloop_path_set_special(char **argv, unsigned num_content)
sizeof(runloop_st->name.savestate));
fill_pathname_dir(runloop_st->name.replay,
str,
".bsv",
".replay",
sizeof(runloop_st->name.replay));
RARCH_LOG("%s \"%s\".\n",
msg_hash_to_str(MSG_REDIRECTING_SAVESTATE_TO),

4
tasks/task_movie.c
View file

@ -65,7 +65,7 @@ static bool bsv_movie_init_playback(
if (!file)
{
RARCH_ERR("Could not open BSV file for playback, path : \"%s\".\n", path);
RARCH_ERR("Could not open replay file for playback, path : \"%s\".\n", path);
return false;
}
@ -139,7 +139,7 @@ static bool bsv_movie_init_record(
if (!file)
{
RARCH_ERR("Could not open BSV file for recording, path : \"%s\".\n", path);
RARCH_ERR("Could not open replay file for recording, path : \"%s\".\n", path);
return false;
}