From 182ad31c635f0241ba2892902e1260fb5a17e323 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 20 May 2020 02:19:20 +0200
Subject: [PATCH] (retroarch.c) Relocate structs and enums
---
retroarch.c | 97 ++++++++++++++++++++++++++---------------------------
1 file changed, 48 insertions(+), 49 deletions(-)
diff --git a/retroarch.c b/retroarch.c
index 87b5d31801..cbc83ac021 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1068,6 +1068,13 @@ enum runloop_state
RUNLOOP_STATE_QUIT
};
+enum rarch_movie_type
+{
+ RARCH_MOVIE_PLAYBACK = 0,
+ RARCH_MOVIE_RECORD
+};
+
+
typedef struct runloop_ctx_msg_info
{
const char *msg;
@@ -1076,6 +1083,47 @@ typedef struct runloop_ctx_msg_info
bool flush;
} runloop_ctx_msg_info_t;
+struct rarch_dir_list
+{
+ struct string_list *list;
+ size_t ptr;
+};
+
+struct bsv_state
+{
+ bool movie_start_recording;
+ bool movie_start_playback;
+ bool movie_playback;
+ bool eof_exit;
+ bool movie_end;
+
+ /* Movie playback/recording support. */
+ char movie_path[PATH_MAX_LENGTH];
+ /* Immediate playback/recording. */
+ char movie_start_path[PATH_MAX_LENGTH];
+};
+
+struct bsv_movie
+{
+ intfstream_t *file;
+
+ /* A ring buffer keeping track of positions
+ * in the file for each frame. */
+ size_t *frame_pos;
+ size_t frame_mask;
+ size_t frame_ptr;
+
+ size_t min_file_pos;
+
+ size_t state_size;
+ uint8_t *state;
+
+ bool playback;
+ bool first_rewind;
+ bool did_rewind;
+};
+
+
static struct global g_extern;
static struct retro_callbacks retro_ctx;
static struct retro_core_t current_core;
@@ -1191,13 +1239,6 @@ static char current_valid_extensions[1024] = {0};
static char error_string[255] = {0};
static char cached_video_driver[32] = {0};
-/* PATHS */
-struct rarch_dir_list
-{
- struct string_list *list;
- size_t ptr;
-};
-
static struct string_list *subsystem_fullpaths = NULL;
static char subsystem_path[PATH_MAX_LENGTH] = {0};
@@ -1217,48 +1258,6 @@ static char current_savefile_dir[PATH_MAX_LENGTH] = {0};
static char current_savestate_dir[PATH_MAX_LENGTH] = {0};
static char dir_savestate[PATH_MAX_LENGTH] = {0};
-/* BSV MOVIE GLOBAL VARIABLES */
-
-enum rarch_movie_type
-{
- RARCH_MOVIE_PLAYBACK = 0,
- RARCH_MOVIE_RECORD
-};
-
-struct bsv_state
-{
- bool movie_start_recording;
- bool movie_start_playback;
- bool movie_playback;
- bool eof_exit;
- bool movie_end;
-
- /* Movie playback/recording support. */
- char movie_path[PATH_MAX_LENGTH];
- /* Immediate playback/recording. */
- char movie_start_path[PATH_MAX_LENGTH];
-};
-
-struct bsv_movie
-{
- intfstream_t *file;
-
- /* A ring buffer keeping track of positions
- * in the file for each frame. */
- size_t *frame_pos;
- size_t frame_mask;
- size_t frame_ptr;
-
- size_t min_file_pos;
-
- size_t state_size;
- uint8_t *state;
-
- bool playback;
- bool first_rewind;
- bool did_rewind;
-};
-
#define BSV_MAGIC 0x42535631
#define MAGIC_INDEX 0