More AL fixes. Seems to be complete now.

[lugaru.git] / Source / openal_wrapper.cpp

diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp
index 991aac2e910cad15ac6be335e2fd2b82848cef43..379b5b2db920dd559259e000c239725fb279e44c 100644 (file)
--- a/Source/openal_wrapper.cpp
+++ b/Source/openal_wrapper.cpp
@@ -92,15 +92,23 @@ typedef struct
     ALuint sid;
     FSOUND_SAMPLE *sample;
     bool startpaused;
-    FSOUND_STREAM *stream;
 } OPENAL_Channels;
 
 typedef struct FSOUND_SAMPLE
 {
+    char *name;
     ALuint bid;  // buffer id.
     int mode;
-} FSOUND_SAMPLE, FSOUND_STREAM;
+    int is2d;
+} FSOUND_SAMPLE;
 
+typedef struct FSOUND_STREAM
+{
+    char *name;
+    ALuint bid;  // buffer id.
+    int mode;
+    int is2d;
+} FSOUND_STREAM;
 
 static size_t num_channels = 0;
 static OPENAL_Channels *channels = NULL;
@@ -123,7 +131,7 @@ signed char F_API OPENAL_3D_SetAttributes(int channel, const float *pos, const f
     if (!initialized) return FALSE;
     if ((channel < 0) || (channel >= num_channels)) return FALSE;
 
-    if (pos != NULL)
+    if ((pos != NULL) && (!channels[channel].sample->is2d))
         alSource3f(channels[channel].sid, AL_POSITION, pos[0], pos[1], -pos[2]);
 
     // we ignore velocity, since doppler's broken in the Linux AL at the moment...
@@ -168,10 +176,14 @@ signed char F_API OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned int
     alcMakeContextCurrent(ctx);
     alcProcessContext(ctx);
 
-    printf("AL_VENDOR: %s\n", (char *) alGetString(AL_VENDOR));
-    printf("AL_RENDERER: %s\n", (char *) alGetString(AL_RENDERER));
-    printf("AL_VERSION: %s\n", (char *) alGetString(AL_VERSION));
-    printf("AL_EXTENSIONS: %s\n", (char *) alGetString(AL_EXTENSIONS));
+    bool cmdline(const char *cmd);
+    if (cmdline("openalinfo"))
+    {
+        printf("AL_VENDOR: %s\n", (char *) alGetString(AL_VENDOR));
+        printf("AL_RENDERER: %s\n", (char *) alGetString(AL_RENDERER));
+        printf("AL_VERSION: %s\n", (char *) alGetString(AL_VERSION));
+        printf("AL_EXTENSIONS: %s\n", (char *) alGetString(AL_EXTENSIONS));
+    }
 
     num_channels = maxsoftwarechannels;
     channels = new OPENAL_Channels[maxsoftwarechannels];
@@ -274,6 +286,9 @@ int F_API OPENAL_PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *d
     channels[channel].sample = sptr;
     alSourcei(channels[channel].sid, AL_BUFFER, sptr->bid);
     alSourcei(channels[channel].sid, AL_LOOPING, (sptr->mode == FSOUND_LOOP_OFF) ? AL_FALSE : AL_TRUE);
+    alSourcei(channels[channel].sid, AL_SOURCE_RELATIVE, (sptr->is2d) ? AL_TRUE : AL_FALSE);
+    alSource3f(channels[channel].sid, AL_POSITION, 0.0f, 0.0f, 0.0f);
+
     channels[channel].startpaused = ((startpaused) ? true : false);
     if (!startpaused)
         alSourcePlay(channels[channel].sid);
@@ -393,6 +408,10 @@ FSOUND_SAMPLE * F_API OPENAL_Sample_Load(int index, const char *name_or_data, un
         retval = new FSOUND_SAMPLE;
         retval->bid = bid;
         retval->mode = FSOUND_LOOP_OFF;
+        retval->is2d = (mode == FSOUND_2D);
+        retval->name = new char[strlen(name_or_data) + 1];
+        if (retval->name)
+            strcpy(retval->name, name_or_data);
     }
 
     free(data);
@@ -414,6 +433,7 @@ void F_API OPENAL_Sample_Free(FSOUND_SAMPLE *sptr)
             }
         }
         alDeleteBuffers(1, &sptr->bid);
+        delete[] sptr->name;
         delete sptr;
     }
 }
@@ -450,14 +470,24 @@ signed char F_API OPENAL_SetFrequency(int channel, int freq)
         alSourcef(channels[channel].sid, AL_PITCH, 8012.0f / 44100.0f);
     else
         alSourcef(channels[channel].sid, AL_PITCH, 1.0f);
-    return TRUE;  // ignore this for now...
+    return TRUE;
 }
 
 signed char F_API OPENAL_SetVolume(int channel, int vol)
 {
     if (!initialized) return FALSE;
+
+    if (channel == FSOUND_ALL)
+    {
+        for (int i = 0; i < num_channels; i++)
+            OPENAL_SetVolume(i, vol);
+        return TRUE;
+    }
+
     if ((channel < 0) || (channel >= num_channels)) return FALSE;
-    if ((vol < 0) || (vol > 255)) return FALSE;
+
+    if (vol < 0) vol = 0;
+    else if (vol > 255) vol = 255;
     ALfloat gain = ((ALfloat) vol) / 255.0f;
     alSourcef(channels[channel].sid, AL_GAIN, gain);
     return TRUE;
@@ -466,6 +496,14 @@ signed char F_API OPENAL_SetVolume(int channel, int vol)
 signed char F_API OPENAL_SetPaused(int channel, signed char paused)
 {
     if (!initialized) return FALSE;
+
+    if (channel == FSOUND_ALL)
+    {
+        for (int i = 0; i < num_channels; i++)
+            OPENAL_SetPaused(i, paused);
+        return TRUE;
+    }
+
     if ((channel < 0) || (channel >= num_channels)) return FALSE;
 
     ALint state = 0;
@@ -494,30 +532,39 @@ void F_API OPENAL_SetSFXMasterVolume(int volume)
 signed char F_API OPENAL_StopSound(int channel)
 {
     if (!initialized) return FALSE;
+
+    if (channel == FSOUND_ALL)
+    {
+        for (int i = 0; i < num_channels; i++)
+            OPENAL_StopSound(i);
+        return TRUE;
+    }
+
     if ((channel < 0) || (channel >= num_channels)) return FALSE;
     alSourceStop(channels[channel].sid);
+    channels[channel].startpaused = false;
     return TRUE;
 }
 
 FSOUND_STREAM * F_API OPENAL_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length)
 {
-    return OPENAL_Sample_Load(FSOUND_FREE, name_or_data, mode, offset, length)
+    return (FSOUND_STREAM *) OPENAL_Sample_Load(FSOUND_FREE, name_or_data, mode, offset, length);
 }
 
 signed char F_API OPENAL_Stream_Close(FSOUND_STREAM *stream)
 {
-    OPENAL_Sample_Free(stream);
+    OPENAL_Sample_Free((FSOUND_SAMPLE *) stream);
 }
 
 FSOUND_SAMPLE * F_API OPENAL_Stream_GetSample(FSOUND_STREAM *stream)
 {
     if (!initialized) return NULL;
-    return NULL;  // this is wrong, but it works for Lugaru 1.
+    return (FSOUND_SAMPLE *) stream;
 }
 
 int F_API OPENAL_Stream_PlayEx(int channel, FSOUND_STREAM *stream, FSOUND_DSPUNIT *dsp, signed char startpaused)
 {
-    return OPENAL_PlaySoundEx(channel, stream, dsp, startpaused);
+    return OPENAL_PlaySoundEx(channel, (FSOUND_SAMPLE *) stream, dsp, startpaused);
 }
 
 signed char F_API OPENAL_Stream_Stop(FSOUND_STREAM *stream)
@@ -525,7 +572,7 @@ signed char F_API OPENAL_Stream_Stop(FSOUND_STREAM *stream)
     if (!initialized) return FALSE;
     for (int i = 0; i < num_channels; i++)
     {
-        if (channels[i].sample == stream)
+        if (channels[i].sample == (FSOUND_SAMPLE *) stream)
         {
             alSourceStop(channels[i].sid);
             channels[i].startpaused = false;
@@ -536,7 +583,7 @@ signed char F_API OPENAL_Stream_Stop(FSOUND_STREAM *stream)
 
 signed char F_API OPENAL_Stream_SetMode(FSOUND_STREAM *stream, unsigned int mode)
 {
-    return OPENAL_Sample_SetMode(stream, mode);
+    return OPENAL_Sample_SetMode((FSOUND_SAMPLE *) stream, mode);
 }
 
 void F_API OPENAL_Update()