X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.cpp;h=dc40cac65796a124d03992cac470316abd47733c;hb=c62522f90f5dc405505af885e00c8134f17d8c88;hp=a5980693f0a4e31e38d54ddd2a761206b45b058a;hpb=2adf4594e7eccc24647a6fce8ebf77da56c9c9d0;p=lugaru.git

diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp
index a598069..dc40cac 100644
--- a/Source/openal_wrapper.cpp
+++ b/Source/openal_wrapper.cpp
@@ -96,6 +96,7 @@ typedef struct
 
 typedef struct FSOUND_SAMPLE
 {
+    char *name;
     ALuint bid;  // buffer id.
     int mode;
     int is2d;
@@ -103,6 +104,7 @@ typedef struct FSOUND_SAMPLE
 
 typedef struct FSOUND_STREAM
 {
+    char *name;
     ALuint bid;  // buffer id.
     int mode;
     int is2d;
@@ -174,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];
@@ -307,6 +313,7 @@ static void *decode_to_pcm(const char *_fname, ALenum &format, ALsizei &size, AL
 
     ALubyte *retval = NULL;
 
+    #if 0  // untested, so disable this!
     // Can we just feed it to the AL compressed?
     if (alIsExtensionPresent((const ALubyte *) "AL_EXT_vorbis"))
     {
@@ -325,6 +332,7 @@ static void *decode_to_pcm(const char *_fname, ALenum &format, ALsizei &size, AL
         }
         return retval;
     }
+    #endif
 
     // Uncompress and feed to the AL.
     OggVorbis_File vf;
@@ -403,6 +411,9 @@ FSOUND_SAMPLE * F_API OPENAL_Sample_Load(int index, const char *name_or_data, un
         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);
@@ -424,6 +435,7 @@ void F_API OPENAL_Sample_Free(FSOUND_SAMPLE *sptr)
             }
         }
         alDeleteBuffers(1, &sptr->bid);
+        delete[] sptr->name;
         delete sptr;
     }
 }
@@ -460,14 +472,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;
@@ -476,6 +498,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;
@@ -504,8 +534,17 @@ 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;
 }
 
@@ -522,7 +561,7 @@ signed char F_API OPENAL_Stream_Close(FSOUND_STREAM *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)