From 272002310dae9dc8ed2f5ed088c7797655133192 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 28 Jul 2014 20:01:27 +0200 Subject: [PATCH] Rename more references to 'roms' --- .../browser/dirfragment/DetectCoreDirectoryFragment.java | 2 +- .../retroarch/browser/dirfragment/DirectoryFragment.java | 2 +- docs/retroarch.1 | 8 ++++---- dynamic.c | 2 +- file.c | 6 +++--- general.h | 4 ++-- libretro.h | 6 +++--- retroarch.c | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java b/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java index 5263c42344..de1706d4c6 100644 --- a/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java +++ b/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java @@ -192,7 +192,7 @@ public final class DetectCoreDirectoryFragment extends DirectoryFragment Enumeration entries = zipFile.entries(); - // Try to handle the case of small text files bundles with ROMs. + // Try to handle the case of small text files bundles with content. long largestEntry = Long.MIN_VALUE; while (entries.hasMoreElements()) diff --git a/android/phoenix/src/com/retroarch/browser/dirfragment/DirectoryFragment.java b/android/phoenix/src/com/retroarch/browser/dirfragment/DirectoryFragment.java index 2317eb8136..5d36e339ad 100644 --- a/android/phoenix/src/com/retroarch/browser/dirfragment/DirectoryFragment.java +++ b/android/phoenix/src/com/retroarch/browser/dirfragment/DirectoryFragment.java @@ -85,7 +85,7 @@ public class DirectoryFragment extends DialogFragment } /** - * Listener interface for executing ROMs or performing + * Listener interface for executing content or performing * other things upon the DirectoryFragment instance closing. */ public interface OnDirectoryFragmentClosedListener diff --git a/docs/retroarch.1 b/docs/retroarch.1 index 657fea3875..91d244425a 100644 --- a/docs/retroarch.1 +++ b/docs/retroarch.1 @@ -43,7 +43,7 @@ By default, only keyboard input is accepted. .TP \fB[rom file]\fR If no rom file path is defined on the command line, \fBretroarch\fR will try to load a core with no rom. This will only work with some libretro cores. -\fBretroarch\fR use uncompressed ROMs, but can uncompress roms in the .zip/deflate format if support for it is compiled in. +\fBretroarch\fR use uncompressed content, but can uncompress content in the .zip/deflate format if support for it is compiled in. ROM types supported depend on the libretro implementation used. .TP @@ -114,10 +114,10 @@ Every config file will be appended in order where the key-value pairs of the nex .TP \fB--subsystem SUBSYSTEM\fR -Use a subsystem of the loaded libretro core. Multiple ROMs are loaded as multiple arguments. +Use a subsystem of the loaded libretro core. Multiple content files are loaded as multiple arguments. If a ROM is skipped, use a blank ("") command line argument. -ROMs must be loaded in an order which depends on the particular subsystem used. -See verbose log output to learn how a particular subsystem wants ROMs to be loaded. +Content must be loaded in an order which depends on the particular subsystem used. +See verbose log output to learn how a particular subsystem wants content to be loaded. .TP \fB--nodevice PORT, -N PORT\fR diff --git a/dynamic.c b/dynamic.c index b4fdd44e68..3e1fdbc4b8 100644 --- a/dynamic.c +++ b/dynamic.c @@ -887,7 +887,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) RARCH_LOG("Special game type: %s\n", info[i].desc); RARCH_LOG(" Ident: %s\n", info[i].ident); RARCH_LOG(" ID: %u\n", info[i].id); - RARCH_LOG(" ROMs:\n"); + RARCH_LOG(" Content:\n"); for (j = 0; j < info[i].num_roms; j++) { RARCH_LOG(" %s (%s)\n", diff --git a/file.c b/file.c index 19d50f53f9..867ff563a7 100644 --- a/file.c +++ b/file.c @@ -404,18 +404,18 @@ bool init_rom_file(void) if (special->num_roms && !g_extern.subsystem_fullpaths) { - RARCH_ERR("libretro core requires special ROMs, but none were provided.\n"); + RARCH_ERR("libretro core requires special content, but none were provided.\n"); return false; } else if (special->num_roms && special->num_roms != g_extern.subsystem_fullpaths->size) { - RARCH_ERR("libretro core requires %u ROMs for subsystem \"%s\", but %u ROMs were provided.\n", special->num_roms, special->desc, + RARCH_ERR("libretro core requires %u content files for subsystem \"%s\", but %u content files were provided.\n", special->num_roms, special->desc, (unsigned)g_extern.subsystem_fullpaths->size); return false; } else if (!special->num_roms && g_extern.subsystem_fullpaths && g_extern.subsystem_fullpaths->size) { - RARCH_ERR("libretro core takes no ROMs for subsystem \"%s\", but %u ROMs were provided.\n", special->desc, + RARCH_ERR("libretro core takes no content for subsystem \"%s\", but %u content files were provided.\n", special->desc, (unsigned)g_extern.subsystem_fullpaths->size); return false; } diff --git a/general.h b/general.h index 8388f47e8f..d5f5fb442e 100644 --- a/general.h +++ b/general.h @@ -428,10 +428,10 @@ struct global char basename[PATH_MAX]; char fullpath[PATH_MAX]; - // A list of save types and associated paths for all ROMs. + // A list of save types and associated paths for all content. struct string_list *savefiles; - // For --subsystem ROMs. + // For --subsystem content. char subsystem[256]; struct string_list *subsystem_fullpaths; diff --git a/libretro.h b/libretro.h index d132fb101a..e06e30a0ac 100755 --- a/libretro.h +++ b/libretro.h @@ -398,7 +398,7 @@ enum retro_mod #define RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY 9 // const char ** -- // Returns the "system" directory of the frontend. - // This directory can be used to store system specific ROMs such as BIOSes, configuration data, etc. + // This directory can be used to store system specific content such as BIOSes, configuration data, etc. // The returned value can be NULL. // If so, no such directory is defined, // and it's up to the implementation to find a suitable directory. @@ -790,7 +790,7 @@ struct retro_subsystem_rom_info bool block_extract; // Same definition as retro_get_system_info(). bool required; // This is set if the ROM is required to load a game. If this is set to false, a zeroed-out retro_game_info can be passed. - // ROMs can have multiple associated persistent memory types (retro_get_memory()). + // Content can have multiple associated persistent memory types (retro_get_memory()). const struct retro_subsystem_memory_info *memory; unsigned num_memory; }; @@ -809,7 +809,7 @@ struct retro_subsystem_info // If a frontend creates new file paths based on the ROM used (e.g. savestates), it should use the path for the first ROM to do so. const struct retro_subsystem_rom_info *roms; - unsigned num_roms; // Number of ROMs associated with a subsystem. + unsigned num_roms; // Number of content files associated with a subsystem. unsigned id; // The type passed to retro_load_game_special(). }; diff --git a/retroarch.c b/retroarch.c index d68773d725..14bda2ee77 100644 --- a/retroarch.c +++ b/retroarch.c @@ -770,10 +770,10 @@ static void print_help(void) #ifdef HAVE_DYNAMIC puts("\t-L/--libretro: Path to libretro implementation. Overrides any config setting."); #endif - puts("\t--subsystem: Use a subsystem of the libretro core. Multiple ROMs are loaded as multiple arguments."); + puts("\t--subsystem: Use a subsystem of the libretro core. Multiple content files are loaded as multiple arguments."); puts("\t\tIf a ROM is skipped, use a blank (\"\") command line argument"); - puts("\t\tROMs must be loaded in an order which depends on the particular subsystem used."); - puts("\t\tSee verbose log output to learn how a particular subsystem wants ROMs to be loaded."); + puts("\t\tContent must be loaded in an order which depends on the particular subsystem used."); + puts("\t\tSee verbose log output to learn how a particular subsystem wants content to be loaded."); printf("\t-N/--nodevice: Disconnects controller device connected to port (1 to %d).\n", MAX_PLAYERS); printf("\t-A/--dualanalog: Connect a DualAnalog controller to port (1 to %d).\n", MAX_PLAYERS);