From 372e7d94cdd6d20ae8b5fe23b6181bcdd4e7f713 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 May 2016 07:14:10 +0200 Subject: [PATCH] Rename rewind.c to state_manager --- Makefile.common | 2 +- command_event.c | 4 ++-- core_impl.c | 2 +- gfx/drivers_shader/shader_gl_cg.c | 2 +- gfx/drivers_shader/shader_glsl.c | 2 +- gfx/drivers_shader/shader_hlsl.c | 2 +- griffin/griffin.c | 4 ++-- runloop.c | 2 +- rewind.c => state_manager.c | 5 ++--- rewind.h => state_manager.h | 8 ++++---- 10 files changed, 16 insertions(+), 17 deletions(-) rename rewind.c => state_manager.c (99%) rename rewind.h => state_manager.h (93%) diff --git a/Makefile.common b/Makefile.common index 39c1b13713..6293255e73 100644 --- a/Makefile.common +++ b/Makefile.common @@ -157,7 +157,7 @@ OBJ += frontend/frontend.o \ dynamic.o \ cores/dynamic_dummy.o \ libretro-common/queues/message_queue.o \ - rewind.o \ + state_manager.o \ gfx/drivers_font_renderer/bitmapfont.o \ input/input_autodetect.o \ input/input_joypad_driver.o \ diff --git a/command_event.c b/command_event.c index 969cebc8ac..d7fe441311 100644 --- a/command_event.c +++ b/command_event.c @@ -37,7 +37,7 @@ #include "screenshot.h" #include "msg_hash.h" #include "retroarch.h" -#include "rewind.h" +#include "state_manager.h" #include "system.h" #include "ui/ui_companion_driver.h" #include "list_special.h" @@ -1183,7 +1183,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) #ifdef HAVE_NETPLAY if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL)) #endif - init_rewind(); + state_manager_event_init(); break; case EVENT_CMD_REWIND_TOGGLE: if (settings->rewind_enable) diff --git a/core_impl.c b/core_impl.c index 0f6671cac4..f494381b5e 100644 --- a/core_impl.c +++ b/core_impl.c @@ -30,7 +30,7 @@ #include "core.h" #include "general.h" #include "msg_hash.h" -#include "rewind.h" +#include "state_manager.h" #include "system.h" #include "gfx/video_driver.h" #include "audio/audio_driver.h" diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index ab1eb44872..b74363bf67 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -40,7 +40,7 @@ #include "../video_shader_parse.h" #include "../../core.h" #include "../../dynamic.h" -#include "../../rewind.h" +#include "../../state_manager.h" #include "../video_state_tracker.h" #include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h" diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index bde5eafe1e..0cbf335aa6 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -27,7 +27,7 @@ #include "shader_glsl.h" #include "../video_state_tracker.h" #include "../../dynamic.h" -#include "../../rewind.h" +#include "../../state_manager.h" #include "../../core.h" #ifdef HAVE_CONFIG_H diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c index cd24d4674b..5fbf0ae3aa 100644 --- a/gfx/drivers_shader/shader_hlsl.c +++ b/gfx/drivers_shader/shader_hlsl.c @@ -20,7 +20,7 @@ #include "../video_shader_parse.h" #include "../d3d/d3d.h" -#include "../../rewind.h" +#include "../../state_manager.h" #include "../drivers/d3d_shaders/opaque.hlsl.d3d9.h" diff --git a/griffin/griffin.c b/griffin/griffin.c index e9e4060fae..9aa38f3899 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -668,9 +668,9 @@ CONFIGURATION #include "../configuration.c" /*============================================================ -REWIND +STATE MANAGER ============================================================ */ -#include "../rewind.c" +#include "../state_manager.c" /*============================================================ FRONTEND diff --git a/runloop.c b/runloop.c index 3154be7a65..400719d3b3 100644 --- a/runloop.c +++ b/runloop.c @@ -44,7 +44,7 @@ #include "movie.h" #include "retroarch.h" #include "runloop.h" -#include "rewind.h" +#include "state_manager.h" #include "system.h" #include "list_special.h" #include "audio/audio_driver.h" diff --git a/rewind.c b/state_manager.c similarity index 99% rename from rewind.c rename to state_manager.c index e0b2a05e87..cd7ee598d7 100644 --- a/rewind.c +++ b/state_manager.c @@ -21,7 +21,7 @@ #include -#include "rewind.h" +#include "state_manager.h" #include "configuration.h" #include "msg_hash.h" #include "movie.h" @@ -132,7 +132,6 @@ static size_t state_manager_raw_maxsize(size_t uncomp) static void *state_manager_raw_alloc(size_t len, uint16_t uniq) { size_t len16 = (len + sizeof(uint16_t) - 1) & -sizeof(uint16_t); - uint16_t *ret = (uint16_t*)calloc(len16 + sizeof(uint16_t) * 4 + 16, 1); /* Force in a different byte at the end, so we don't need to check @@ -621,7 +620,7 @@ static void state_manager_capacity(state_manager_t *state, } #endif -void init_rewind(void) +void state_manager_event_init(void) { retro_ctx_serialize_info_t serial_info; retro_ctx_size_info_t info; diff --git a/rewind.h b/state_manager.h similarity index 93% rename from rewind.h rename to state_manager.h index acd63177da..e023d55f2d 100644 --- a/rewind.h +++ b/state_manager.h @@ -15,8 +15,8 @@ * If not, see . */ -#ifndef __RARCH_REWIND_H -#define __RARCH_REWIND_H +#ifndef __STATE_MANAGER_H +#define __STATE_MANAGER_H #ifdef __cplusplus extern "C" { @@ -28,12 +28,12 @@ extern "C" { typedef struct state_manager state_manager_t; -void init_rewind(void); - bool state_manager_frame_is_reversed(void); void state_manager_event_deinit(void); +void state_manager_event_init(void); + /** * check_rewind: * @pressed : was rewind key pressed or held?