Rename state tracker files

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)

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

gfx/shader/shader_gl_cg.c

@@ -37,7 +37,7 @@
 #include "../../dynamic.h"
 #include <file/file_path.h>
 
-#include "../state_tracker.h"
+#include "../video_state_tracker.h"
 
 #if 0
 #define RARCH_CG_DEBUG

gfx/shader/shader_glsl.c

@@ -19,7 +19,7 @@
 #include "shader_glsl.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
-#include "../state_tracker.h"
+#include "../video_state_tracker.h"
 #include "../../dynamic.h"
 #include "../../file_ops.h"
 

gfx/shader/shader_null.c

@@ -19,7 +19,7 @@
 #include "../../general.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
-#include "../state_tracker.h"
+#include "../video_state_tracker.h"
 #include "../../dynamic.h"
 #include <gfx/math/matrix_4x4.h>
 

gfx/shader/shader_parse.h

@@ -19,7 +19,7 @@
 
 #include <boolean.h>
 #include <file/config_file.h>
-#include "../state_tracker.h"
+#include "../video_state_tracker.h"
 #include <retro_miscellaneous.h>
 
 #ifdef __cplusplus

gfx/video_state_python.c

@@ -19,14 +19,14 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "py_state.h"
+#include "video_state_python.h"
-#include "../../dynamic.h"
+#include "../dynamic.h"
-#include "../../libretro.h"
+#include "../libretro.h"
-#include "../../general.h"
+#include "../general.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
-#include "../../input/input_common.h"
+#include "../input/input_common.h"
-#include "../../file_ops.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;
 }
-

gfx/video_state_python.h

@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __RARCH_PY_STATE_H
+#ifndef __VIDEO_STATE_PYTHON_H
-#define __RARCH_PY_STATE_H
+#define __VIDEO_STATE_PYTHON_H
 
 #include <stdint.h>
 #include <boolean.h>

gfx/video_state_tracker.c

@@ -14,14 +14,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "state_tracker.h"
+#include "video_state_tracker.h"
 #include <stdlib.h>
 #include <compat/strl.h>
 #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

gfx/video_state_tracker.h

@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __RARCH_LIBRETRO_TRACKER_H
+#ifndef __VIDEO_STATE_TRACKER_H
-#define __RARCH_LIBRETRO_TRACKER_H
+#define __VIDEO_STATE_TRACKER_H
 
 #ifdef __cplusplus
 extern "C" {

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
 
 /*============================================================