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

diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp
index a7bce97..dc40cac 100644
--- a/Source/openal_wrapper.cpp
+++ b/Source/openal_wrapper.cpp
@@ -96,10 +96,20 @@ typedef struct
 
 typedef struct FSOUND_SAMPLE
 {
+    char *name;
     ALuint bid;  // buffer id.
     int mode;
+    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;
 static bool initialized = false;
@@ -121,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...
@@ -166,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];
@@ -268,11 +282,13 @@ int F_API OPENAL_PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *d
     }
 
     if ((channel < 0) || (channel >= num_channels)) return -1;
-    ALint state = 0;
     alSourceStop(channels[channel].sid);
     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);
@@ -297,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"))
     {
@@ -315,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;
@@ -392,6 +410,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);
@@ -413,6 +435,7 @@ void F_API OPENAL_Sample_Free(FSOUND_SAMPLE *sptr)
             }
         }
         alDeleteBuffers(1, &sptr->bid);
+        delete[] sptr->name;
         delete sptr;
     }
 }
@@ -420,7 +443,7 @@ void F_API OPENAL_Sample_Free(FSOUND_SAMPLE *sptr)
 signed char F_API OPENAL_Sample_SetMode(FSOUND_SAMPLE *sptr, unsigned int mode)
 {
     if (!initialized) return FALSE;
-    if (mode != FSOUND_LOOP_NORMAL) return FALSE;
+    if ((mode != FSOUND_LOOP_NORMAL) && (mode != FSOUND_LOOP_OFF)) return FALSE;
     if (!sptr) return FALSE;
     sptr->mode = mode;
     return TRUE;
@@ -437,14 +460,36 @@ signed char F_API OPENAL_Sample_SetMinMaxDistance(FSOUND_SAMPLE *sptr, float min
 signed char F_API OPENAL_SetFrequency(int channel, int freq)
 {
     if (!initialized) return FALSE;
-    return TRUE;  // ignore this for now...
+    if (channel == FSOUND_ALL)
+    {
+        for (int i = 0; i < num_channels; i++)
+            OPENAL_SetFrequency(i, freq);
+        return TRUE;
+    }
+
+    if ((channel < 0) || (channel >= num_channels)) return FALSE;
+    if (freq == 8012)  // hack
+        alSourcef(channels[channel].sid, AL_PITCH, 8012.0f / 44100.0f);
+    else
+        alSourcef(channels[channel].sid, AL_PITCH, 1.0f);
+    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;
@@ -453,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;
@@ -481,45 +534,58 @@ 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)
 {
-    if (!initialized) return NULL;
-    return 0;
+    return (FSOUND_STREAM *) OPENAL_Sample_Load(FSOUND_FREE, name_or_data, mode, offset, length);
 }
 
 signed char F_API OPENAL_Stream_Close(FSOUND_STREAM *stream)
 {
-    if (!initialized) return FALSE;
-    return 0;
+    OPENAL_Sample_Free((FSOUND_SAMPLE *) stream);
 }
 
 FSOUND_SAMPLE * F_API OPENAL_Stream_GetSample(FSOUND_STREAM *stream)
 {
     if (!initialized) return NULL;
-    return 0;
+    return (FSOUND_SAMPLE *) stream;
 }
 
 int F_API OPENAL_Stream_PlayEx(int channel, FSOUND_STREAM *stream, FSOUND_DSPUNIT *dsp, signed char startpaused)
 {
-    if (!initialized) return -1;
-    return 0;
+    return OPENAL_PlaySoundEx(channel, (FSOUND_SAMPLE *) stream, dsp, startpaused);
 }
 
 signed char F_API OPENAL_Stream_Stop(FSOUND_STREAM *stream)
 {
     if (!initialized) return FALSE;
-    return 0;
+    for (int i = 0; i < num_channels; i++)
+    {
+        if (channels[i].sample == (FSOUND_SAMPLE *) stream)
+        {
+            alSourceStop(channels[i].sid);
+            channels[i].startpaused = false;
+        }
+    }
+    return TRUE;
 }
 
 signed char F_API OPENAL_Stream_SetMode(FSOUND_STREAM *stream, unsigned int mode)
 {
-    if (!initialized) return FALSE;
-    return 0;
+    return OPENAL_Sample_SetMode((FSOUND_SAMPLE *) stream, mode);
 }
 
 void F_API OPENAL_Update()
@@ -528,5 +594,10 @@ void F_API OPENAL_Update()
     alcProcessContext(alcGetCurrentContext());
 }
 
+signed char F_API OPENAL_SetOutput(int outputtype)
+{
+    return TRUE;
+}
+
 #endif