avoid prefixes from h_gau_types

Author: swistakm

extensions/gau.pxd

@@ -3,21 +3,21 @@ include "h_ga_types.pxi"
 include "h_gau_types.pxi"
 
 cdef extern from "gorilla/gau.h":
-    cdef gau_Manager* manager_create "gau_manager_create" ()
+    cdef Manager* manager_create "gau_manager_create" ()
 
-    cdef gau_Manager* manager_create_custom "gau_manager_create_custom" (
+    cdef Manager* manager_create_custom "gau_manager_create_custom" (
         int32 in_devType,
         int32 in_threadPolicy,
         int32 in_numBuffers,
         int32 in_bufferSamples
     )
 
-    cdef void manager_update "gau_manager_update" (gau_Manager* in_mgr)
-    cdef ga_Mixer* manager_mixer "gau_manager_mixer" (gau_Manager* in_mgr)
-    cdef ga_StreamManager* manager_streamManager "gau_manager_streamManager" (gau_Manager* in_mgr)
-    cdef ga_Device* manager_device "gau_manager_device" (gau_Manager* in_mgr)
+    cdef void manager_update "gau_manager_update" (Manager* in_mgr)
+    cdef ga_Mixer* manager_mixer "gau_manager_mixer" (Manager* in_mgr)
+    cdef ga_StreamManager* manager_streamManager "gau_manager_streamManager" (Manager* in_mgr)
+    cdef ga_Device* manager_device "gau_manager_device" (Manager* in_mgr)
 
-    cdef void manager_destroy "gau_manager_destroy" (gau_Manager* in_mgr)
+    cdef void manager_destroy "gau_manager_destroy" (Manager* in_mgr)
     cdef ga_DataSource* data_source_create_file "gau_data_source_create_file" (const char* in_filename)
     cdef ga_DataSource* data_source_create_file_arc "gau_data_source_create_file_arc" (
         const char* in_filename,
@@ -47,20 +47,20 @@ cdef extern from "gorilla/gau.h":
         ga_Sound* in_sound
     )
 
-    cdef gau_SampleSourceLoop* sample_source_create_loop "gau_sample_source_create_loop" (
+    cdef SampleSourceLoop* sample_source_create_loop "gau_sample_source_create_loop" (
         ga_SampleSource* in_sampleSrc
     )
 
     cdef void sample_source_loop_set "gau_sample_source_loop_set" (
-        gau_SampleSourceLoop* in_sampleSrc,
+        SampleSourceLoop* in_sampleSrc,
         int32 in_triggerSample,
         int32 in_targetSample
     )
 
-    cdef void sample_source_loop_clear "gau_sample_source_loop_clear" (gau_SampleSourceLoop* in_sampleSrc)
+    cdef void sample_source_loop_clear "gau_sample_source_loop_clear" (SampleSourceLoop* in_sampleSrc)
 
     cdef int32 sample_source_loop_count "gau_sample_source_loop_count" (
-        gau_SampleSourceLoop* in_sampleSrc
+        SampleSourceLoop* in_sampleSrc
     )
 
     cdef void on_finish_destroy "gau_on_finish_destroy" (
@@ -77,15 +77,15 @@ cdef extern from "gorilla/gau.h":
     cdef ga_Handle* create_handle_memory "gau_create_handle_memory" (
         ga_Mixer* in_mixer, ga_Memory* in_memory, const char* in_format,
         ga_FinishCallback in_callback, void* in_context,
-        gau_SampleSourceLoop** out_loopSrc
+        SampleSourceLoop** out_loopSrc
     )
 
     cdef ga_Handle* create_handle_sound "gau_create_handle_sound" (
         ga_Mixer* in_mixer,
         ga_Sound* in_sound,
         ga_FinishCallback in_callback,
         void* in_context,
-        gau_SampleSourceLoop** out_loopSrc
+        SampleSourceLoop** out_loopSrc
     )
 
     cdef ga_Handle* create_handle_buffered_data "gau_create_handle_buffered_data" (
@@ -95,7 +95,7 @@ cdef extern from "gorilla/gau.h":
         const char* in_format,
         ga_FinishCallback in_callback,
         void* in_context,
-        gau_SampleSourceLoop** out_loopSrc
+        SampleSourceLoop** out_loopSrc
     )
 
     cdef ga_Handle* create_handle_buffered_file "gau_create_handle_buffered_file" (
@@ -105,5 +105,5 @@ cdef extern from "gorilla/gau.h":
         const char* in_format,
         ga_FinishCallback in_callback,
         void* in_context,
-        gau_SampleSourceLoop** out_loopSrc
+        SampleSourceLoop** out_loopSrc
     )

extensions/h_gau_types.pxi

@@ -1,3 +1,7 @@
 cdef extern from "gorilla/gau.h":
     ctypedef struct gau_Manager
     ctypedef struct gau_SampleSourceLoop
+
+    # rename to avoid prefixes
+    ctypedef gau_SampleSourceLoop SampleSourceLoop "gau_SampleSourceLoop"
+    ctypedef gau_Manager Manager "gau_Manager"

extensions/internal.pyx

@@ -25,12 +25,14 @@ def play(filename, ext):
     :param ext:
     :return:
     """
-    cdef gau.gau_Manager* mgr
+    cdef gau.Manager* mgr
+
+
     cdef ga.ga_Mixer* mixer
     cdef ga.ga_Sound* sound
     cdef ga.ga_Handle* handle
-    cdef gau.gau_SampleSourceLoop* loopSrc = NULL
-    cdef gau.gau_SampleSourceLoop** pLoopSrc = &loopSrc
+    cdef gau.SampleSourceLoop* loopSrc = NULL
+    cdef gau.SampleSourceLoop** pLoopSrc = &loopSrc
     cdef ga.int32 loop = 0
     cdef ga.int32 quit = 0