--- a/src/audio/mint/SDL_mintaudio_gsxb.c	Sun Oct 01 16:10:41 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Tue Oct 17 09:15:21 2006 +0000
@@ -63,176 +63,83 @@
 
 /*--- Audio driver functions ---*/
 
-static void Mint_CloseAudio(_THIS);
-static int Mint_OpenAudio(_THIS, SDL_AudioSpec * spec);
-static void Mint_LockAudio(_THIS);
-static void Mint_UnlockAudio(_THIS);
-
-/* To check/init hardware audio */
-static int Mint_CheckAudio(_THIS, SDL_AudioSpec * spec);
-static void Mint_InitAudio(_THIS, SDL_AudioSpec * spec);
-
 /* GSXB callbacks */
-static void Mint_GsxbInterrupt(void);
-static void Mint_GsxbNullInterrupt(void);
-
-/*--- Audio driver bootstrap functions ---*/
-
-static int
-Audio_Available(void)
-{
-    const char *envr = SDL_getenv("SDL_AUDIODRIVER");
-
-    /* Check if user asked a different audio driver */
-    if ((envr) && (SDL_strcmp(envr, MINT_AUDIO_DRIVER_NAME) != 0)) {
-        DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));
-        return (0);
-    }
-
-    /* Cookie _SND present ? if not, assume ST machine */
-    if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) {
-        cookie_snd = SND_PSG;
-    }
-
-    /* Check if we have 16 bits audio */
-    if ((cookie_snd & SND_16BIT) == 0) {
-        DEBUG_PRINT((DEBUG_NAME "no 16 bits sound\n"));
-        return (0);
-    }
-
-    /* Cookie GSXB present ? */
-    cookie_gsxb = (Getcookie(C_GSXB, &cookie_gsxb) == C_FOUND);
-
-    /* Is it GSXB ? */
-    if (((cookie_snd & SND_GSXB) == 0) || (cookie_gsxb == 0)) {
-        DEBUG_PRINT((DEBUG_NAME "no GSXB audio\n"));
-        return (0);
-    }
-
-    /* Check if audio is lockable */
-    if (Locksnd() != 1) {
-        DEBUG_PRINT((DEBUG_NAME "audio locked by other application\n"));
-        return (0);
-    }
-
-    Unlocksnd();
-
-    DEBUG_PRINT((DEBUG_NAME "GSXB audio available!\n"));
-    return (1);
-}
+static void MINTGSXB_GsxbInterrupt(void);
+static void MINTGSXB_GsxbNullInterrupt(void);
 
 static void
-Audio_DeleteDevice(SDL_AudioDevice * device)
-{
-    SDL_free(device->hidden);
-    SDL_free(device);
-}
-
-static SDL_AudioDevice *
-Audio_CreateDevice(int devindex)
-{
-    SDL_AudioDevice *this;
-
-    /* Initialize all variables that we clean on shutdown */
-    this = (SDL_AudioDevice *) SDL_malloc(sizeof(SDL_AudioDevice));
-    if (this) {
-        SDL_memset(this, 0, (sizeof *this));
-        this->hidden = (struct SDL_PrivateAudioData *)
-            SDL_malloc((sizeof *this->hidden));
-    }
-    if ((this == NULL) || (this->hidden == NULL)) {
-        SDL_OutOfMemory();
-        if (this) {
-            SDL_free(this);
-        }
-        return (0);
-    }
-    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
-
-    /* Set the function pointers */
-    this->OpenAudio = Mint_OpenAudio;
-    this->CloseAudio = Mint_CloseAudio;
-    this->LockAudio = Mint_LockAudio;
-    this->UnlockAudio = Mint_UnlockAudio;
-    this->free = Audio_DeleteDevice;
-
-    return this;
-}
-
-AudioBootStrap MINTAUDIO_GSXB_bootstrap = {
-    MINT_AUDIO_DRIVER_NAME, "MiNT GSXB audio driver",
-    Audio_Available, Audio_CreateDevice
-};
-
-static void
-Mint_LockAudio(_THIS)
+MINTGSXB_LockDevice(_THIS)
 {
     /* Stop replay */
     Buffoper(0);
 }
 
 static void
-Mint_UnlockAudio(_THIS)
+MINTGSXB_UnlockDevice(_THIS)
 {
     /* Restart replay */
     Buffoper(SB_PLA_ENA | SB_PLA_RPT);
 }
 
 static void
-Mint_CloseAudio(_THIS)
+MINTGSXB_CloseDevice(_THIS)
 {
-    /* Stop replay */
-    Buffoper(0);
+    if (this->hidden != NULL) {
+        /* Stop replay */
+        Buffoper(0);
 
-    /* Uninstall interrupt */
-    if (NSetinterrupt(2, SI_NONE, Mint_GsxbNullInterrupt) < 0) {
-        DEBUG_PRINT((DEBUG_NAME "NSetinterrupt() failed in close\n"));
-    }
+        /* Uninstall interrupt */
+        if (NSetinterrupt(2, SI_NONE, MINTGSXB_GsxbNullInterrupt) < 0) {
+            DEBUG_PRINT((DEBUG_NAME "NSetinterrupt() failed in close\n"));
+        }
 
-    /* Wait if currently playing sound */
-    while (SDL_MintAudio_mutex != 0) {
-    }
+        /* Wait if currently playing sound */
+        while (SDL_MintAudio_mutex != 0) {}
 
-    /* Clear buffers */
-    if (SDL_MintAudio_audiobuf[0]) {
-        Mfree(SDL_MintAudio_audiobuf[0]);
-        SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL;
+        /* Clear buffers */
+        if (SDL_MintAudio_audiobuf[0]) {
+            Mfree(SDL_MintAudio_audiobuf[0]);
+            SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL;
+        }
+
+        /* Unlock sound system */
+        Unlocksnd();
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
     }
-
-    /* Unlock sound system */
-    Unlocksnd();
 }
 
 static int
-Mint_CheckAudio(_THIS, SDL_AudioSpec * spec)
+MINTGSXB_CheckAudio(_THIS)
 {
     long snd_format;
     int i, resolution, format_signed, format_bigendian;
-    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
     int valid_datatype = 0;
 
-    resolution = SDL_AUDIO_BITSIZE(spec->format);
-    format_signed = SDL_AUDIO_ISSIGNED(spec->format);
-    format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
+    resolution = SDL_AUDIO_BITSIZE(this->spec.format);
+    format_signed = SDL_AUDIO_ISSIGNED(this->spec.format);
+    format_bigendian = SDL_AUDIO_ISBIGENDIAN(this->spec.format);
 
     DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ", resolution));
-    DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
+    DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(this->spec.format)));
     DEBUG_PRINT(("signed=%d, ", format_signed));
     DEBUG_PRINT(("big endian=%d, ", format_bigendian));
-    DEBUG_PRINT(("channels=%d, ", spec->channels));
-    DEBUG_PRINT(("freq=%d\n", spec->freq));
+    DEBUG_PRINT(("channels=%d, ", this->spec.channels));
+    DEBUG_PRINT(("freq=%d\n", this->spec.freq));
 
-    if (spec->channels > 2) {
-        spec->channels = 2;     /* no more than stereo! */
+    if (this->spec.channels > 2) {
+        this->spec.channels = 2;     /* no more than stereo! */
     }
 
     while ((!valid_datatype) && (test_format)) {
         /* Check formats available */
         snd_format = Sndstatus(SND_QUERYFORMATS);
-        spec->format = test_format;
-        resolution = SDL_AUDIO_BITSIZE(spec->format);
-        format_signed = SDL_AUDIO_ISSIGNED(spec->format);
-        format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
+        this->spec.format = test_format;
+        resolution = SDL_AUDIO_BITSIZE(this->spec.format);
+        format_signed = SDL_AUDIO_ISSIGNED(this->spec.format);
+        format_bigendian = SDL_AUDIO_ISBIGENDIAN(this->spec.format);
         switch (test_format) {
             case AUDIO_U8:
             case AUDIO_S8:
@@ -279,14 +186,14 @@
             /* Ok */
         } else if (snd_format & SND_FORMATUNSIGNED) {
             /* Give unsigned format */
-            spec->format = spec->format & (~SDL_AUDIO_MASK_SIGNED);
+            this->spec.format = this->spec.format & (~SDL_AUDIO_MASK_SIGNED);
         }
     } else {
         if (snd_format & SND_FORMATUNSIGNED) {
             /* Ok */
         } else if (snd_format & SND_FORMATSIGNED) {
             /* Give signed format */
-            spec->format |= SDL_AUDIO_MASK_SIGNED;
+            this->spec.format |= SDL_AUDIO_MASK_SIGNED;
         }
     }
 
@@ -295,14 +202,14 @@
             /* Ok */
         } else if (snd_format & SND_FORMATLITTLEENDIAN) {
             /* Give little endian format */
-            spec->format = spec->format & (~SDL_AUDIO_MASK_ENDIAN);
+            this->spec.format = this->spec.format & (~SDL_AUDIO_MASK_ENDIAN);
         }
     } else {
         if (snd_format & SND_FORMATLITTLEENDIAN) {
             /* Ok */
         } else if (snd_format & SND_FORMATBIGENDIAN) {
             /* Give big endian format */
-            spec->format |= SDL_AUDIO_MASK_ENDIAN;
+            this->spec.format |= SDL_AUDIO_MASK_ENDIAN;
         }
     }
 
@@ -324,22 +231,22 @@
     }
 #endif
 
-    MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, spec->freq);
-    spec->freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
+    MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, this->spec.freq);
+    this->spec.freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
 
     DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",
-                 SDL_AUDIO_BITSIZE(spec->format)));
-    DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
-    DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
-    DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
-    DEBUG_PRINT(("channels=%d, ", spec->channels));
-    DEBUG_PRINT(("freq=%d\n", spec->freq));
+                 SDL_AUDIO_BITSIZE(this->spec.format)));
+    DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(this->spec.format)));
+    DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(this->spec.format)));
+    DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(this->spec.format)));
+    DEBUG_PRINT(("channels=%d, ", this->spec.channels));
+    DEBUG_PRINT(("freq=%d\n", this->spec.freq));
 
     return 0;
 }
 
 static void
-Mint_InitAudio(_THIS, SDL_AudioSpec * spec)
+MINTGSXB_InitAudio(_THIS)
 {
     int channels_mode, prediv;
     void *buffer;
@@ -352,23 +259,23 @@
     Setmontracks(0);
 
     /* Select replay format */
-    switch (SDL_AUDIO_BITSIZE(spec->format)) {
+    switch (SDL_AUDIO_BITSIZE(this->spec.format)) {
     case 8:
-        if (spec->channels == 2) {
+        if (this->spec.channels == 2) {
             channels_mode = STEREO8;
         } else {
             channels_mode = MONO8;
         }
         break;
     case 16:
-        if (spec->channels == 2) {
+        if (this->spec.channels == 2) {
             channels_mode = STEREO16;
         } else {
             channels_mode = MONO16;
         }
         break;
     case 32:
-        if (spec->channels == 2) {
+        if (this->spec.channels == 2) {
             channels_mode = STEREO32;
         } else {
             channels_mode = MONO32;
@@ -387,12 +294,12 @@
 
     /* Set buffer */
     buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf];
-    if (Setbuffer(0, buffer, buffer + spec->size) < 0) {
+    if (Setbuffer(0, buffer, buffer + this->spec.size) < 0) {
         DEBUG_PRINT((DEBUG_NAME "Setbuffer() failed\n"));
     }
 
     /* Install interrupt */
-    if (NSetinterrupt(2, SI_PLAY, Mint_GsxbInterrupt) < 0) {
+    if (NSetinterrupt(2, SI_PLAY, MINTGSXB_GsxbInterrupt) < 0) {
         DEBUG_PRINT((DEBUG_NAME "NSetinterrupt() failed\n"));
     }
 
@@ -402,35 +309,46 @@
 }
 
 static int
-Mint_OpenAudio(_THIS, SDL_AudioSpec * spec)
+MINTGSXB_OpenDevice(_THIS, const char *devname, int iscapture)
 {
     /* Lock sound system */
     if (Locksnd() != 1) {
-        SDL_SetError("Mint_OpenAudio: Audio system already in use");
-        return (-1);
+        SDL_SetError("MINTGSXB_OpenDevice: Audio system already in use");
+        return 0;
     }
 
     SDL_MintAudio_device = this;
 
     /* Check audio capabilities */
-    if (Mint_CheckAudio(this, spec) == -1) {
-        return -1;
+    if (MINTGSXB_CheckAudio(this) == -1) {
+        return 0;
     }
 
-    SDL_CalculateAudioSpec(spec);
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+                        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        SDL_OutOfMemory();
+        return 0;
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    SDL_CalculateAudioSpec(&this->spec);
 
     /* Allocate memory for audio buffers in DMA-able RAM */
-    DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", spec->size));
+    DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", this->spec.size));
 
-    SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(spec->size * 2, MX_STRAM);
+    SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(this->spec.size * 2, MX_STRAM);
     if (SDL_MintAudio_audiobuf[0] == NULL) {
-        SDL_SetError("MINT_OpenAudio: Not enough memory for audio buffer");
-        return (-1);
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+        SDL_OutOfMemory();
+        return 0;
     }
-    SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + spec->size;
+    SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + this->spec.size;
     SDL_MintAudio_numbuf = 0;
-    SDL_memset(SDL_MintAudio_audiobuf[0], spec->silence, spec->size * 2);
-    SDL_MintAudio_audiosize = spec->size;
+    SDL_memset(SDL_MintAudio_audiobuf[0],this->spec.silence,this->spec.size*2);
+    SDL_MintAudio_audiosize = this->spec.size;
     SDL_MintAudio_mutex = 0;
 
     DEBUG_PRINT((DEBUG_NAME "buffer 0 at 0x%08x\n",
@@ -441,13 +359,13 @@
     SDL_MintAudio_CheckFpu();
 
     /* Setup audio hardware */
-    Mint_InitAudio(this, spec);
+    MINTGSXB_InitAudio(this);
 
-    return (1);                 /* We don't use threaded audio */
+    return 1;  /* good to go. */
 }
 
 static void
-Mint_GsxbInterrupt(void)
+MINTGSXB_GsxbInterrupt(void)
 {
     Uint8 *newbuf;
 
@@ -465,8 +383,57 @@
 }
 
 static void
-Mint_GsxbNullInterrupt(void)
+MINTGSXB_GsxbNullInterrupt(void)
 {
 }
 
+static int
+MINTGSXB_Init(SDL_AudioDriverImpl *impl)
+{
+    /* Cookie _SND present ? if not, assume ST machine */
+    if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) {
+        cookie_snd = SND_PSG;
+    }
+
+    /* Check if we have 16 bits audio */
+    if ((cookie_snd & SND_16BIT) == 0) {
+        SDL_SetError(DEBUG_NAME "no 16-bit sound");
+        return 0;
+    }
+
+    /* Cookie GSXB present ? */
+    cookie_gsxb = (Getcookie(C_GSXB, &cookie_gsxb) == C_FOUND);
+
+    /* Is it GSXB ? */
+    if (((cookie_snd & SND_GSXB) == 0) || (cookie_gsxb == 0)) {
+        SDL_SetError(DEBUG_NAME "no GSXB audio");
+        return 0;
+    }
+
+    /* Check if audio is lockable */
+    if (Locksnd() != 1) {
+        SDL_SetError(DEBUG_NAME "audio locked by other application");
+        return 0;
+    }
+
+    Unlocksnd();
+
+    DEBUG_PRINT((DEBUG_NAME "GSXB audio available!\n"));
+
+    /* Set the function pointers */
+    impl->OpenDevice = MINTGSXB_OpenDevice;
+    impl->CloseDevice = MINTGSXB_CloseDevice;
+    impl->LockAudio = MINTGSXB_LockAudio;
+    impl->UnlockAudio = MINTGSXB_UnlockAudio;
+    impl->OnlyHasDefaultOutputDevice = 1;
+    impl->ProvidesOwnCallbackThread = 1;
+    impl->SkipMixerLock = 1;
+
+    return 1;
+}
+
+AudioBootStrap MINTAUDIO_GSXB_bootstrap = {
+    MINT_AUDIO_DRIVER_NAME, "MiNT GSXB audio driver", MINTGSXB_Init, 0
+};
+
 /* vi: set ts=4 sw=4 expandtab: */