aboutsummaryrefslogtreecommitdiff
path: root/games/doomlegacy/files/patch-i_sound.c
diff options
context:
space:
mode:
Diffstat (limited to 'games/doomlegacy/files/patch-i_sound.c')
-rw-r--r--games/doomlegacy/files/patch-i_sound.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/games/doomlegacy/files/patch-i_sound.c b/games/doomlegacy/files/patch-i_sound.c
index d847bb12cff8..ad6b62954e46 100644
--- a/games/doomlegacy/files/patch-i_sound.c
+++ b/games/doomlegacy/files/patch-i_sound.c
@@ -1,5 +1,5 @@
---- sdl/i_sound.c.orig Mon Apr 19 01:02:24 2004
-+++ sdl/i_sound.c Sat Mar 5 23:04:27 2005
+--- sdl/i_sound.c.orig 2004-04-18 23:02:24.000000000 +0200
++++ sdl/i_sound.c 2012-02-04 08:58:36.000000000 +0100
@@ -118,7 +118,7 @@
#define SAMPLERATE 11025 // Hz
@@ -9,3 +9,46 @@
static int lengths[NUMSFX]; // The actual lengths of all sound effects.
static unsigned int channelstep[NUM_CHANNELS]; // The channel step amount...
+@@ -517,12 +517,12 @@
+ // Mixing channel index.
+ int chan;
+
+- extern void music_mixer(void *udata, Uint8 * stream, int len);
++ //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);
+
+ if (nosound)
+ return;
+@@ -709,14 +709,15 @@
+ /*
+ Should this be exposed in mixer.h?
+ */
+- extern void close_music(void);
++ //extern void close_music(void);
+ if (nomusic)
+ return;
+
+ if (!musicStarted)
+ return;
+
+- close_music();
++ //close_music();
++ Mix_CloseAudio();
+
+ CONS_Printf("I_ShutdownMusic: shut down\n");
+ musicStarted = false;
+@@ -740,7 +741,8 @@
+ if (nomusic)
+ return;
+
+- if (open_music(&audio) < 0)
++ //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;