From fc806d2914d137f930a103f7ddc276256dd82e25 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 16:00:13 +0100 Subject: [PATCH] Rename state tracker files --- Makefile.common | 4 ++-- gfx/d3d/render_chain.h | 2 +- gfx/shader/shader_gl_cg.c | 2 +- gfx/shader/shader_glsl.c | 2 +- gfx/shader/shader_null.c | 2 +- gfx/shader/shader_parse.h | 2 +- .../py_state.c => video_state_python.c} | 21 ++++++++++++------- .../py_state.h => video_state_python.h} | 4 ++-- ...{state_tracker.c => video_state_tracker.c} | 4 ++-- ...{state_tracker.h => video_state_tracker.h} | 4 ++-- griffin/griffin.c | 4 ++-- 11 files changed, 29 insertions(+), 22 deletions(-) rename gfx/{py_state/py_state.c => video_state_python.c} (95%) rename gfx/{py_state/py_state.h => video_state_python.h} (94%) rename gfx/{state_tracker.c => video_state_tracker.c} (99%) rename gfx/{state_tracker.h => video_state_tracker.h} (97%) diff --git a/Makefile.common b/Makefile.common index 3d2d0d6546..f48484a7ae 100644 --- a/Makefile.common +++ b/Makefile.common @@ -167,7 +167,7 @@ endif ifeq ($(HAVE_PYTHON), 1) DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter LIBS += $(PYTHON_LIBS) - OBJ += gfx/py_state/py_state.o + OBJ += gfx/video_state_python.o endif ifeq ($(HAVE_EMSCRIPTEN), 1) @@ -372,7 +372,7 @@ ifeq ($(HAVE_OPENGL), 1) gfx/fonts/gl_font.o \ gfx/fonts/gl_raster_font.o \ libretro-sdk/gfx/math/matrix_4x4.o \ - gfx/state_tracker.o \ + gfx/video_state_tracker.o \ libretro-sdk/glsym/rglgen.o ifeq ($(HAVE_KMS), 1) diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h index 0658c229e9..e58bfb33c1 100644 --- a/gfx/d3d/render_chain.h +++ b/gfx/d3d/render_chain.h @@ -18,7 +18,7 @@ #define __D3D_RENDER_CHAIN_H #include "d3d.h" -#include "../state_tracker.h" +#include "../video_state_tracker.h" #include "../shader/shader_parse.h" struct Vertex diff --git a/gfx/shader/shader_gl_cg.c b/gfx/shader/shader_gl_cg.c index 20a63e392b..bc9d090ea5 100644 --- a/gfx/shader/shader_gl_cg.c +++ b/gfx/shader/shader_gl_cg.c @@ -37,7 +37,7 @@ #include "../../dynamic.h" #include -#include "../state_tracker.h" +#include "../video_state_tracker.h" #if 0 #define RARCH_CG_DEBUG diff --git a/gfx/shader/shader_glsl.c b/gfx/shader/shader_glsl.c index 89b6032533..8b34f9267a 100644 --- a/gfx/shader/shader_glsl.c +++ b/gfx/shader/shader_glsl.c @@ -19,7 +19,7 @@ #include "shader_glsl.h" #include #include -#include "../state_tracker.h" +#include "../video_state_tracker.h" #include "../../dynamic.h" #include "../../file_ops.h" diff --git a/gfx/shader/shader_null.c b/gfx/shader/shader_null.c index 074ed0cc7d..e98795330e 100644 --- a/gfx/shader/shader_null.c +++ b/gfx/shader/shader_null.c @@ -19,7 +19,7 @@ #include "../../general.h" #include #include -#include "../state_tracker.h" +#include "../video_state_tracker.h" #include "../../dynamic.h" #include diff --git a/gfx/shader/shader_parse.h b/gfx/shader/shader_parse.h index c4b97f44fe..748f49dcbf 100644 --- a/gfx/shader/shader_parse.h +++ b/gfx/shader/shader_parse.h @@ -19,7 +19,7 @@ #include #include -#include "../state_tracker.h" +#include "../video_state_tracker.h" #include #ifdef __cplusplus diff --git a/gfx/py_state/py_state.c b/gfx/video_state_python.c similarity index 95% rename from gfx/py_state/py_state.c rename to gfx/video_state_python.c index 1d2e018513..43ba3c28f9 100644 --- a/gfx/py_state/py_state.c +++ b/gfx/video_state_python.c @@ -19,14 +19,14 @@ #include #include -#include "py_state.h" -#include "../../dynamic.h" -#include "../../libretro.h" -#include "../../general.h" +#include "video_state_python.h" +#include "../dynamic.h" +#include "../libretro.h" +#include "../general.h" #include #include -#include "../../input/input_common.h" -#include "../../file_ops.h" +#include "../input/input_common.h" +#include "../file_ops.h" static PyObject* py_read_wram(PyObject *self, PyObject *args) { @@ -95,6 +95,14 @@ static const struct retro_keybind *py_binds[MAX_USERS] = { g_settings.input.binds[5], g_settings.input.binds[6], g_settings.input.binds[7], + g_settings.input.binds[8], + g_settings.input.binds[9], + g_settings.input.binds[10], + g_settings.input.binds[11], + g_settings.input.binds[12], + g_settings.input.binds[13], + g_settings.input.binds[14], + g_settings.input.binds[15], }; static PyObject *py_read_input(PyObject *self, PyObject *args) @@ -397,4 +405,3 @@ float py_state_get(py_state_t *handle, const char *id, Py_DECREF(ret); return retval; } - diff --git a/gfx/py_state/py_state.h b/gfx/video_state_python.h similarity index 94% rename from gfx/py_state/py_state.h rename to gfx/video_state_python.h index 2381c2ece3..d38a5f62e9 100644 --- a/gfx/py_state/py_state.h +++ b/gfx/video_state_python.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef __RARCH_PY_STATE_H -#define __RARCH_PY_STATE_H +#ifndef __VIDEO_STATE_PYTHON_H +#define __VIDEO_STATE_PYTHON_H #include #include diff --git a/gfx/state_tracker.c b/gfx/video_state_tracker.c similarity index 99% rename from gfx/state_tracker.c rename to gfx/video_state_tracker.c index 66def8253e..7db13731a0 100644 --- a/gfx/state_tracker.c +++ b/gfx/video_state_tracker.c @@ -14,14 +14,14 @@ * If not, see . */ -#include "state_tracker.h" +#include "video_state_tracker.h" #include #include #include "../general.h" #include "../input/input_common.h" #ifdef HAVE_PYTHON -#include "py_state/py_state.h" +#include "video_state_python.h" #endif struct state_tracker_internal diff --git a/gfx/state_tracker.h b/gfx/video_state_tracker.h similarity index 97% rename from gfx/state_tracker.h rename to gfx/video_state_tracker.h index e02e400fde..8e8924145b 100644 --- a/gfx/state_tracker.h +++ b/gfx/video_state_tracker.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef __RARCH_LIBRETRO_TRACKER_H -#define __RARCH_LIBRETRO_TRACKER_H +#ifndef __VIDEO_STATE_TRACKER_H +#define __VIDEO_STATE_TRACKER_H #ifdef __cplusplus extern "C" { diff --git a/griffin/griffin.c b/griffin/griffin.c index 5a131f3544..a950d92a08 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -395,10 +395,10 @@ INPUT /*============================================================ STATE TRACKER ============================================================ */ -#include "../gfx/state_tracker.c" +#include "../gfx/video_state_tracker.c" #ifdef HAVE_PYTHON -#include "../gfx/py_state/py_state.c" +#include "../gfx/video_state_python.c" #endif /*============================================================