X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_SDL.lisp;h=3ced5c31ad7c96ccfb2a2aa9543b4e570be9942a;hb=6a3d1ffb69036e6d4f1c239fd7d52f9bfc48d50c;hp=5dd383eefed4f661033d5ea479c8ee4e3b36831b;hpb=3747c2cd2da9c0a618628fa649ece29830581464;p=gacela.git

diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index 5dd383e..3ced5c3 100644
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -68,6 +68,8 @@
 (mapcconst int "int" "SDL_LIL_ENDIAN")
 (mapcconst int "int" "SDL_BIG_ENDIAN")
 
+(mapcconst int "int" "MIX_DEFAULT_FORMAT")
+
 ;;; SDL Functions
 (defcfun "int gacela_SDL_Init (int flags)" 0
   "return SDL_Init (flags);")
@@ -148,6 +150,45 @@
 (defcfun "int gacela_zoomSurface (int src, double zoomx, double zoomy, int smooth)" 0
   "return zoomSurface (src, zoomx, zoomy, smooth);")
 
+(defcfun "int gacela_Mix_OpenAudio (int frequency, int format, int channels, int chunksize)" 0
+  "return Mix_OpenAudio (frequency, format, channels, chunksize);")
+
+(defcfun "int gacela_Mix_LoadMUS (char *file)" 0
+  "return Mix_LoadMUS (file);")
+
+(defcfun "int gacela_Mix_LoadWAV (char *file)" 0
+  "return Mix_LoadWAV (file);")
+
+(defcfun "int gacela_Mix_PlayChannel (int channel, int chunk, int loops)" 0
+  "return Mix_PlayChannel (channel, chunk, loops);")
+
+(defcfun "int gacela_Mix_PlayMusic (int music, int loops)" 0
+  "return Mix_PlayMusic (music, loops);")
+
+(defcfun "int gacela_Mix_PlayingMusic (void)" 0
+  "return Mix_PlayingMusic ();")
+
+(defcfun "int gacela_Mix_PausedMusic (void)" 0
+  "return Mix_PausedMusic ();")
+
+(defcfun "void gacela_Mix_PauseMusic (void)" 0
+  "Mix_PauseMusic ();")
+
+(defcfun "void gacela_Mix_ResumeMusic (void)" 0
+  "Mix_ResumeMusic ();")
+
+(defcfun "int gacela_Mix_HaltMusic (void)" 0
+  "return Mix_HaltMusic ();")
+
+(defcfun "void gacela_Mix_FreeMusic (int music)" 0
+  "Mix_FreeMusic (music);")
+
+(defcfun "void gacela_Mix_FreeChunk (int chunk)" 0
+  "Mix_FreeChunk (chunk);")
+
+(defcfun "void gacela_Mix_CloseAudio (void)" 0
+  "Mix_CloseAudio ();")
+
 (defentry SDL_Init (int) (int "gacela_SDL_Init"))
 (defentry SDL_Quit () (void "gacela_SDL_Quit"))
 (defentry SDL_SetVideoMode (int int int int) (int "gacela_SDL_SetVideoMode"))
@@ -171,19 +212,19 @@
 ;(defentry TTF_OpenFont (string int) (int "gacela_TTF_OpenFont"))
 ;(defentry TTF_CloseFont (int) (void "gacela_TTF_CloseFont"))
 ;(defentry TTF_Quit () (void "gacela_TTF_Quit"))
-;(defentry Mix_OpenAudio (int int int) (int "gacela_Mix_OpenAudio"))
-;(defentry Mix_LoadMUS (string) (int "gacela_Mix_LoadMUS"))
-;(defentry Mix_LoadWAV (string) (int "gacela_Mix_LoadWAV"))
-;(defentry Mix_PlayChannel (int int int) (int "gacela_Mix_PlayChannel"))
-;(defentry Mix_PlayMusic (int int) (int "gacela_Mix_PlayMusic"))
-;(defentry Mix_PlayingMusic () (int "gacela_Mix_PlayingMusic"))
-;(defentry Mix_PausedMusic () (int "gacela_Mix_PausedMusic"))
-;(defentry Mix_PauseMusic () (void "gacela_Mix_PauseMusic"))
-;(defentry Mix_ResumeMusic () (void "gacela_Mix_ResumeMusic"))
-;(defentry Mix_HaltMusic () (int "gacela_Mix_HaltMusic"))
-;(defentry Mix_FreeMusic (int) (void "gacela_Mix_FreeMusic"))
-;(defentry Mix_FreeChunk (int) (void "gacela_Mix_FreeChunk"))
-;(defentry Mix_CloseAudio () (void "gacela_Mix_CloseAudio"))
+(defentry Mix_OpenAudio (int int int int) (int "gacela_Mix_OpenAudio"))
+(defentry Mix_LoadMUS (string) (int "gacela_Mix_LoadMUS"))
+(defentry Mix_LoadWAV (string) (int "gacela_Mix_LoadWAV"))
+(defentry Mix_PlayChannel (int int int) (int "gacela_Mix_PlayChannel"))
+(defentry Mix_PlayMusic (int int) (int "gacela_Mix_PlayMusic"))
+(defentry Mix_PlayingMusic () (int "gacela_Mix_PlayingMusic"))
+(defentry Mix_PausedMusic () (int "gacela_Mix_PausedMusic"))
+(defentry Mix_PauseMusic () (void "gacela_Mix_PauseMusic"))
+(defentry Mix_ResumeMusic () (void "gacela_Mix_ResumeMusic"))
+(defentry Mix_HaltMusic () (int "gacela_Mix_HaltMusic"))
+(defentry Mix_FreeMusic (int) (void "gacela_Mix_FreeMusic"))
+(defentry Mix_FreeChunk (int) (void "gacela_Mix_FreeChunk"))
+(defentry Mix_CloseAudio () (void "gacela_Mix_CloseAudio"))
 ;(defentry free (int) (void "gacela_free"))
 (defentry SDL_GL_SwapBuffers () (void "gacela_SDL_GL_SwapBuffers"))
 (defentry SDL_EnableKeyRepeat (int int) (int "gacela_SDL_EnableKeyRepeat"))
@@ -211,14 +252,6 @@
   "const SDL_Surface *s = surface;"
   "return s->format->BytesPerPixel;")
 
-(defcfun "int gacela_resize_surface (int surface, int width, int height)" 0
-  "const SDL_Surface *s = surface;"
-  "if (s->w == width && s->h == height) {"
-  "  return s;"
-  "} else {"
-  "  return zoomSurface (s, width / s->w, height / s->h, 0);"
-  "}")
-
 ;(defentry apply-surface2 (int int int int int int int int int) (void "apply_surface"))
 ;(defentry render-text2 (int string int int int) (int "render_text"))
 ;(defentry box-collision (int int int int int int) (int "box_collision"))
@@ -229,4 +262,3 @@
 (defentry surface-h (int) (int "gacela_surface_h"))
 (defentry surface-pixels (int) (int "gacela_surface_pixels"))
 (defentry surface-format-BytesPerPixel (int) (int "gacela_surface_format_BytesPerPixel"))
-(defentry resize-surface (int int int) (int "gacela_resize_surface"))