correctly swap the channels for vorbis audio encoding

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 001af198539e94c7df2220dbf5c7b144b2f25004..c4218af8e28c246b3e28d1df298cd0b6230936ad 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "snd_main.h"
 #include "snd_ogg.h"
 #include "snd_modplug.h"
+#include "csprogs.h"
 
 
 #define SND_MIN_SPEED 8000
@@ -32,27 +33,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SND_MAX_WIDTH 2
 #define SND_MIN_CHANNELS 1
 #define SND_MAX_CHANNELS 8
-
 #if SND_LISTENERS != 8
 #      error this data only supports up to 8 channel, update it!
 #endif
-typedef struct listener_s
-{
-       float yawangle;
-       float dotscale;
-       float dotbias;
-       float ambientvolume;
-}
-listener_t;
-typedef struct speakerlayout_s
-{
-       const char *name;
-       unsigned int channels;
-       listener_t listeners[SND_LISTENERS];
-}
-speakerlayout_t;
 
-static speakerlayout_t snd_speakerlayout;
+speakerlayout_t snd_speakerlayout;
 
 // Our speaker layouts are based on ALSA. They differ from those
 // Win32 and Mac OS X APIs use when there's more than 4 channels.
@@ -63,27 +48,27 @@ static const speakerlayout_t snd_speakerlayouts[] =
        {
                "surround71", 8,
                {
-                       {45, 0.2, 0.2, 0.5}, // front left
-                       {315, 0.2, 0.2, 0.5}, // front right
-                       {135, 0.2, 0.2, 0.5}, // rear left
-                       {225, 0.2, 0.2, 0.5}, // rear right
-                       {0, 0.2, 0.2, 0.5}, // front center
-                       {0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
-                       {90, 0.2, 0.2, 0.5}, // side left
-                       {180, 0.2, 0.2, 0.5}, // side right
+                       {0, 45, 0.2, 0.2, 0.5}, // front left
+                       {1, 315, 0.2, 0.2, 0.5}, // front right
+                       {2, 135, 0.2, 0.2, 0.5}, // rear left
+                       {3, 225, 0.2, 0.2, 0.5}, // rear right
+                       {4, 0, 0.2, 0.2, 0.5}, // front center
+                       {5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
+                       {6, 90, 0.2, 0.2, 0.5}, // side left
+                       {7, 180, 0.2, 0.2, 0.5}, // side right
                }
        },
        {
                "surround51", 6,
                {
-                       {45, 0.2, 0.2, 0.5}, // front left
-                       {315, 0.2, 0.2, 0.5}, // front right
-                       {135, 0.2, 0.2, 0.5}, // rear left
-                       {225, 0.2, 0.2, 0.5}, // rear right
-                       {0, 0.2, 0.2, 0.5}, // front center
-                       {0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 45, 0.2, 0.2, 0.5}, // front left
+                       {1, 315, 0.2, 0.2, 0.5}, // front right
+                       {2, 135, 0.2, 0.2, 0.5}, // rear left
+                       {3, 225, 0.2, 0.2, 0.5}, // rear right
+                       {4, 0, 0.2, 0.2, 0.5}, // front center
+                       {5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        },
        {
@@ -91,14 +76,14 @@ static const speakerlayout_t snd_speakerlayouts[] =
                // channel of its own
                "surround40", 4,
                {
-                       {45, 0.3, 0.3, 0.8}, // front left
-                       {315, 0.3, 0.3, 0.8}, // front right
-                       {135, 0.3, 0.3, 0.8}, // rear left
-                       {225, 0.3, 0.3, 0.8}, // rear right
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 45, 0.3, 0.3, 0.8}, // front left
+                       {1, 315, 0.3, 0.3, 0.8}, // front right
+                       {2, 135, 0.3, 0.3, 0.8}, // rear left
+                       {3, 225, 0.3, 0.3, 0.8}, // rear right
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        },
        {
@@ -106,27 +91,27 @@ static const speakerlayout_t snd_speakerlayouts[] =
                // channel of its own
                "stereo", 2,
                {
-                       {90, 0.5, 0.5, 1}, // side left
-                       {270, 0.5, 0.5, 1}, // side right
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 90, 0.5, 0.5, 1}, // side left
+                       {1, 270, 0.5, 0.5, 1}, // side right
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        },
        {
                "mono", 1,
                {
-                       {0, 0, 1, 1}, // center
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 0, 0, 1, 1}, // center
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        }
 };
@@ -353,6 +338,11 @@ int S_GetSoundRate(void)
        return snd_renderbuffer ? snd_renderbuffer->format.speed : 0;
 }
 
+int S_GetSoundChannels(void)
+{
+       return snd_renderbuffer ? snd_renderbuffer->format.channels : 0;
+}
+
 
 static qboolean S_ChooseCheaperFormat (snd_format_t* format, qboolean fixed_speed, qboolean fixed_width, qboolean fixed_channels)
 {
@@ -1246,7 +1236,11 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
        {
                if (ch->entnum >= 32768)
                {
-                       // TODO: sounds that follow CSQC entities?
+                       //Con_Printf("-- entnum %i origin %f %f %f neworigin %f %f %f\n", ch->entnum, ch->origin[0], ch->origin[1], ch->origin[2], cl.entities[ch->entnum].state_current.origin[0], cl.entities[ch->entnum].state_current.origin[1], cl.entities[ch->entnum].state_current.origin[2]);
+
+                       if (ch->entnum > 32768)
+                               if (!CL_VM_GetEntitySoundOrigin(ch->entnum, ch->origin))
+                                       ch->entnum = 32768; // entity was removed, disown sound
                }
                else if (cl.entities[ch->entnum].state_current.active)
                {