audited all Sys_Quit calls and gave them return values indicating

[xonotic/darkplaces.git] / snd_main.h

diff --git a/snd_main.h b/snd_main.h
index 82c347273efbc775501cb1db4d0866f218f001f4..66c4474df03b8e371b378a7153a85af9f0e14dd9 100644 (file)
--- a/snd_main.h
+++ b/snd_main.h
@@ -113,7 +113,7 @@ struct snd_fetcher_s
 // 0 to NUM_AMBIENTS - 1 = water, etc
 // NUM_AMBIENTS to NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS - 1 = normal entity sounds
 // NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS to total_channels = static sounds
-#define        MAX_DYNAMIC_CHANNELS    128
+#define        MAX_DYNAMIC_CHANNELS    512
 #define        MAX_CHANNELS                    516
 
 extern unsigned int total_channels;
@@ -126,6 +126,12 @@ extern cvar_t _snd_mixahead;
 extern cvar_t snd_swapstereo;
 extern cvar_t snd_streaming;
 
+#define SND_CHANNELLAYOUT_AUTO         0
+#define SND_CHANNELLAYOUT_STANDARD     1
+#define SND_CHANNELLAYOUT_ALSA         2
+extern cvar_t snd_channellayout;
+
+
 extern int snd_blocked;                // counter. When > 0, we stop submitting sound to the audio device
 
 extern mempool_t *snd_mempool;
@@ -135,8 +141,6 @@ extern mempool_t *snd_mempool;
 // Used for isolating performance in the renderer.
 extern qboolean simsound;
 
-extern qboolean alsaspeakerlayout;
-
 
 // ====================================================================
 //         Architecture-independent functions