Use more explicit types for video and audio buffers

Author: vxgmichel

libgambatte_ext/_libgambatte.pxd

@@ -1,13 +1,14 @@
 from libcpp.string cimport string
+from libc.stdint cimport uint32_t
 
 cdef extern from "gambatte.h" namespace "gambatte":
     cdef cppclass GB:
         GB() except +;
         int load(string& romfile, unsigned flags);
         ptrdiff_t runFor(
-            unsigned int *videoBuf,
+            uint32_t *videoBuf,
             ptrdiff_t pitch,
-	    unsigned int *audioBuf,
+	        uint32_t *audioBuf,
             size_t& samples,
         );
         void setInputGetter(GetInput *getInput);
@@ -17,7 +18,7 @@ cdef extern from "gambatte.h" namespace "gambatte":
         void selectState(int state);
         int currentState();
         int loadState();
-        int saveState(unsigned int *videoBuf, ptrdiff_t pitch);
+        int saveState(uint32_t *videoBuf, ptrdiff_t pitch);
 
 
 cdef extern from "input.h" namespace "gambatte":

libgambatte_ext/libgambatte.pyx

@@ -3,6 +3,7 @@
 # cython: language_level=3
 
 from libcpp.string cimport string
+from libc.stdint cimport uint32_t, int16_t
 from _libgambatte cimport GB as C_GB
 from _libgambatte cimport GetInput as C_GetInput
 
@@ -19,13 +20,13 @@ cdef class GB:
 
     def run_for(
         self,
-        unsigned int[:, ::1] video,
+        uint32_t[:, ::1] video,
         ptrdiff_t pitch,
-        short[:, ::1] audio,
+        int16_t[:, ::1] audio,
         size_t samples,
     ):
-        cdef unsigned int* video_buffer = &video[0, 0]
-        cdef unsigned int* audio_buffer = <unsigned int*>&audio[0, 0]
+        cdef uint32_t* video_buffer = &video[0, 0]
+        cdef uint32_t* audio_buffer = <uint32_t*>&audio[0, 0]
         result = self.c_gb.runFor(video_buffer, pitch, audio_buffer, samples)
         return result, samples
 
@@ -46,10 +47,10 @@ cdef class GB:
 
     def save_state(
         self,
-        unsigned int[:, ::1] video,
+        uint32_t[:, ::1] video,
         ptrdiff_t pitch,
     ):
         if video is None:
             return self.c_gb.saveState(NULL, 0)
-        cdef unsigned int* video_buffer = &video[0, 0]
+        cdef uint32_t* video_buffer = &video[0, 0]
         return self.c_gb.saveState(video_buffer, pitch)

termblit_ext/termblit.pyx

@@ -2,6 +2,7 @@
 
 from libc.stdio cimport sprintf
 from libc.stdlib cimport malloc, free
+from libc.stdint cimport uint32_t
 
 cdef char* move_absolute(char* buff, int x, int y):
     buff += sprintf(buff, "\033[%d;%dH", x, y)
@@ -142,18 +143,18 @@ cdef char* move_from_to(
 
 
 def blit(
-    unsigned int[:, ::1] image,
-    unsigned int[:, ::1] last,
+    uint32_t[:, ::1] image,
+    uint32_t[:, ::1] last,
     int refx, int refy, int width, int height,
     int color_mode,
 ):
 
     cdef int current_x = refx
     cdef int current_y = refy
-    cdef int current_fg = -1
-    cdef int current_bg = -2
+    cdef uint32_t current_fg = -1
+    cdef uint32_t current_bg = -2
     cdef int row_index, column_index
-    cdef int color1, color2
+    cdef uint32_t color1, color2
     cdef int new_x, new_y
     cdef int invert_print
     cdef int image_height = image.shape[0]