[patch] this is that patch

i_sound.patch (text/plain), 1.84 KB, created by Andrey Kalikin on 2006-10-07 12:02:02 UTC

--- SDL/i_sound.c	2004/04/18 12:53:42	1.12
+++ SDL/i_sound.c	2006/07/22 15:38:07	1.13
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id: i_sound.c,v 1.12 2004/04/18 12:53:42 hurdler Exp $
+// $Id: i_sound.c,v 1.13 2006/07/22 15:38:07 hurdler Exp $
 //
 // Copyright (C) 1993-1996 by id Software, Inc.
 //
@@ -15,6 +15,9 @@
 // for more details.
 //
 // $Log: i_sound.c,v $
+// Revision 1.13  2006/07/22 15:38:07  hurdler
+// Quick fix for SDL_mixer compiling issue
+//
 // Revision 1.12  2004/04/18 12:53:42  hurdler
 // fix Heretic issue with SDL and OS/2
 //
@@ -517,12 +520,10 @@
     // Mixing channel index.
     int chan;
 
-    extern void music_mixer(void *udata, Uint8 * stream, int len);
-
     if (nosound)
         return;
     // Mix in the music
-    music_mixer(NULL, stream, len);
+    //music_mixer(NULL, stream, len); // TODO: see what we have to do
 
     if (nosound)
         return;
@@ -705,18 +706,13 @@
 
 void I_ShutdownMusic(void)
 {
-
-    /*
-       Should this be exposed in mixer.h?
-     */
-    extern void close_music(void);
     if (nomusic)
         return;
 
     if (!musicStarted)
         return;
 
-    close_music();
+    Mix_CloseAudio();
 
     CONS_Printf("I_ShutdownMusic: shut down\n");
     musicStarted = false;
@@ -725,11 +721,6 @@
 
 void I_InitMusic(void)
 {
-    /*
-       Should this be exposed in mixer.h?
-     */
-    extern int open_music(SDL_AudioSpec *);
-
     if (nosound)
     {
         // FIXME: workaround for shitty programming undoc'ed features
@@ -740,7 +731,7 @@
     if (nomusic)
         return;
 
-    if (open_music(&audio) < 0)
+    if (Mix_OpenAudio(audio.freq, audio.format, audio.channels, audio.samples) < 0)
     {
         CONS_Printf("Unable to open music: %s\n", Mix_GetError());
         nomusic = true;