Merge branch 'UPSTREAM'

1 files changed, 33 insertions, 43 deletions

diff --git a/examples/alreverb.c b/examples/alreverb.c
index 5001740e..420b1c55 100644
--- a/examples/alreverb.c
+++ b/examples/alreverb.c
@@ -26,13 +26,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
-#include <unistd.h>
-#define Sleep(x) usleep((x)*1000)
-#endif
 
 #include "AL/al.h"
 #include "AL/alc.h"
@@ -40,37 +33,37 @@
 #include "AL/efx-presets.h"
 
 #include "common/alhelpers.h"
-#include "common/alffmpeg.h"
+#include "common/sdl_sound.h"
 
 
-LPALBUFFERSAMPLESSOFT alBufferSamplesSOFT = wrap_BufferSamples;
-LPALISBUFFERFORMATSUPPORTEDSOFT alIsBufferFormatSupportedSOFT;
+static LPALBUFFERSAMPLESSOFT alBufferSamplesSOFT = wrap_BufferSamples;
+static LPALISBUFFERFORMATSUPPORTEDSOFT alIsBufferFormatSupportedSOFT;
 
 /* Effect object functions */
-LPALGENEFFECTS alGenEffects;
-LPALDELETEEFFECTS alDeleteEffects;
-LPALISEFFECT alIsEffect;
-LPALEFFECTI alEffecti;
-LPALEFFECTIV alEffectiv;
-LPALEFFECTF alEffectf;
-LPALEFFECTFV alEffectfv;
-LPALGETEFFECTI alGetEffecti;
-LPALGETEFFECTIV alGetEffectiv;
-LPALGETEFFECTF alGetEffectf;
-LPALGETEFFECTFV alGetEffectfv;
+static LPALGENEFFECTS alGenEffects;
+static LPALDELETEEFFECTS alDeleteEffects;
+static LPALISEFFECT alIsEffect;
+static LPALEFFECTI alEffecti;
+static LPALEFFECTIV alEffectiv;
+static LPALEFFECTF alEffectf;
+static LPALEFFECTFV alEffectfv;
+static LPALGETEFFECTI alGetEffecti;
+static LPALGETEFFECTIV alGetEffectiv;
+static LPALGETEFFECTF alGetEffectf;
+static LPALGETEFFECTFV alGetEffectfv;
 
 /* Auxiliary Effect Slot object functions */
-LPALGENAUXILIARYEFFECTSLOTS alGenAuxiliaryEffectSlots;
-LPALDELETEAUXILIARYEFFECTSLOTS alDeleteAuxiliaryEffectSlots;
-LPALISAUXILIARYEFFECTSLOT alIsAuxiliaryEffectSlot;
-LPALAUXILIARYEFFECTSLOTI alAuxiliaryEffectSloti;
-LPALAUXILIARYEFFECTSLOTIV alAuxiliaryEffectSlotiv;
-LPALAUXILIARYEFFECTSLOTF alAuxiliaryEffectSlotf;
-LPALAUXILIARYEFFECTSLOTFV alAuxiliaryEffectSlotfv;
-LPALGETAUXILIARYEFFECTSLOTI alGetAuxiliaryEffectSloti;
-LPALGETAUXILIARYEFFECTSLOTIV alGetAuxiliaryEffectSlotiv;
-LPALGETAUXILIARYEFFECTSLOTF alGetAuxiliaryEffectSlotf;
-LPALGETAUXILIARYEFFECTSLOTFV alGetAuxiliaryEffectSlotfv;
+static LPALGENAUXILIARYEFFECTSLOTS alGenAuxiliaryEffectSlots;
+static LPALDELETEAUXILIARYEFFECTSLOTS alDeleteAuxiliaryEffectSlots;
+static LPALISAUXILIARYEFFECTSLOT alIsAuxiliaryEffectSlot;
+static LPALAUXILIARYEFFECTSLOTI alAuxiliaryEffectSloti;
+static LPALAUXILIARYEFFECTSLOTIV alAuxiliaryEffectSlotiv;
+static LPALAUXILIARYEFFECTSLOTF alAuxiliaryEffectSlotf;
+static LPALAUXILIARYEFFECTSLOTFV alAuxiliaryEffectSlotfv;
+static LPALGETAUXILIARYEFFECTSLOTI alGetAuxiliaryEffectSloti;
+static LPALGETAUXILIARYEFFECTSLOTIV alGetAuxiliaryEffectSlotiv;
+static LPALGETAUXILIARYEFFECTSLOTF alGetAuxiliaryEffectSlotf;
+static LPALGETAUXILIARYEFFECTSLOTFV alGetAuxiliaryEffectSlotfv;
 
 
 /* LoadEffect loads the given reverb properties into a new OpenAL effect
@@ -159,24 +152,21 @@ static ALuint LoadSound(const char *filename)
     ALuint rate, buffer;
     size_t datalen;
     void *data;
-    FilePtr audiofile;
-    StreamPtr sound;
+    FilePtr sound;
 
     /* Open the file and get the first stream from it */
-    audiofile = openAVFile(filename);
-    sound = getAVAudioStream(audiofile, 0);
+    sound = openAudioFile(filename, 1000);
     if(!sound)
     {
         fprintf(stderr, "Could not open audio in %s\n", filename);
-        closeAVFile(audiofile);
         return 0;
     }
 
     /* Get the sound format, and figure out the OpenAL format */
-    if(getAVAudioInfo(sound, &rate, &channels, &type) != 0)
+    if(getAudioInfo(sound, &rate, &channels, &type) != 0)
     {
         fprintf(stderr, "Error getting audio info for %s\n", filename);
-        closeAVFile(audiofile);
+        closeAudioFile(sound);
         return 0;
     }
 
@@ -185,16 +175,16 @@ static ALuint LoadSound(const char *filename)
     {
         fprintf(stderr, "Unsupported format (%s, %s) for %s\n",
                 ChannelsName(channels), TypeName(type), filename);
-        closeAVFile(audiofile);
+        closeAudioFile(sound);
         return 0;
     }
 
     /* Decode the whole audio stream to a buffer. */
-    data = decodeAVAudioStream(sound, &datalen);
+    data = decodeAudioStream(sound, &datalen);
     if(!data)
     {
         fprintf(stderr, "Failed to read audio from %s\n", filename);
-        closeAVFile(audiofile);
+        closeAudioFile(sound);
         return 0;
     }
 
@@ -205,7 +195,7 @@ static ALuint LoadSound(const char *filename)
     alBufferSamplesSOFT(buffer, rate, format, BytesToFrames(datalen, channels, type),
                         channels, type, data);
     free(data);
-    closeAVFile(audiofile);
+    closeAudioFile(sound);
 
     /* Check if an error occured, and clean up if so. */
     err = alGetError();