shithub: choc

Download patch

ref: c83f0c2d0885479ac03edc5b0759db19f6794163
parent: 3fd3abaf9084d89388d0a2fa021db4e72b2e78e0
author: Simon Howard <fraggle@gmail.com>
date: Sat Apr 19 12:41:58 EDT 2008 

Fix build problem when libsamplerate support is enabled.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1124


--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -216,41 +216,6 @@
     return clipped;
 }
 
-// Preload all the sound effects - stops nasty ingame freezes
-
-static void I_PrecacheSounds(void)
-{
-    char namebuf[9];
-    int i;
-
-    printf("I_PrecacheSounds: Precaching all sound effects..");
-
-    for (i=sfx_pistol; i<NUMSFX; ++i)
-    {
-        if ((i % 6) == 0)
-        {
-            printf(".");
-            fflush(stdout);
-        }
-
-        sprintf(namebuf, "ds%s", DEH_String(S_sfx[i].name));
-
-        S_sfx[i].lumpnum = W_CheckNumForName(namebuf);
-
-        if (S_sfx[i].lumpnum != -1)
-        {
-            CacheSFX(i);
-
-            if (sound_chunks[i].abuf != NULL)
-            {
-                Z_ChangeTag(sound_chunks[i].abuf, PU_CACHE);
-            }
-        }
-    }
-
-    printf("\n");
-}
-
 #endif
 
 static boolean ConvertibleRatio(int freq1, int freq2)
@@ -449,6 +414,45 @@
 
     return true;
 }
+
+#ifdef HAVE_LIBSAMPLERATE
+
+// Preload all the sound effects - stops nasty ingame freezes
+
+static void I_PrecacheSounds(void)
+{
+    char namebuf[9];
+    int i;
+
+    printf("I_PrecacheSounds: Precaching all sound effects..");
+
+    for (i=sfx_pistol; i<NUMSFX; ++i)
+    {
+        if ((i % 6) == 0)
+        {
+            printf(".");
+            fflush(stdout);
+        }
+
+        sprintf(namebuf, "ds%s", DEH_String(S_sfx[i].name));
+
+        S_sfx[i].lumpnum = W_CheckNumForName(namebuf);
+
+        if (S_sfx[i].lumpnum != -1)
+        {
+            CacheSFX(i);
+
+            if (sound_chunks[i].abuf != NULL)
+            {
+                Z_ChangeTag(sound_chunks[i].abuf, PU_CACHE);
+            }
+        }
+    }
+
+    printf("\n");
+}
+
+#endif
 
 static Mix_Chunk *GetSFXChunk(int sound_id)
 {
-- 
⑨