Rename LockAudio,UnlockAudio to LockDevice,UnlockDevice. Also some small fixes
authorPatrice Mandin <patmandin@gmail.com>
Fri, 13 Jul 2007 23:58:22 +0000
changeset 219129e07f91bc1f
parent 2190 eff1ccd88273
child 2192 fc56a720cdba
Rename LockAudio,UnlockAudio to LockDevice,UnlockDevice. Also some small fixes
src/audio/mint/SDL_mintaudio_dma8.c
src/audio/mint/SDL_mintaudio_gsxb.c
src/audio/mint/SDL_mintaudio_it.S
src/audio/mint/SDL_mintaudio_mcsn.c
src/audio/mint/SDL_mintaudio_stfa.c
src/audio/mint/SDL_mintaudio_xbios.c
     1.1 --- a/src/audio/mint/SDL_mintaudio_dma8.c	Fri Jul 13 22:55:54 2007 +0000
     1.2 +++ b/src/audio/mint/SDL_mintaudio_dma8.c	Fri Jul 13 23:58:22 2007 +0000
     1.3 @@ -113,8 +113,8 @@
     1.4          }
     1.5  
     1.6          DEBUG_PRINT((DEBUG_NAME "closeaudio: buffers freed\n"));
     1.7 -        SDL_free(this->buffer);
     1.8 -        this->buffer = NULL;
     1.9 +        SDL_free(this->hidden);
    1.10 +        this->hidden = NULL;
    1.11      }
    1.12  }
    1.13  
    1.14 @@ -332,8 +332,8 @@
    1.15      /* Set the function pointers */
    1.16      impl->OpenDevice = MINTDMA8_OpenDevice;
    1.17      impl->CloseDevice = MINTDMA8_CloseDevice;
    1.18 -    impl->LockAudio = MINTDMA8_LockAudio;
    1.19 -    impl->UnlockAudio = MINTDMA8_UnlockAudio;
    1.20 +    impl->LockDevice = MINTDMA8_LockDevice;
    1.21 +    impl->UnlockDevice = MINTDMA8_UnlockDevice;
    1.22      impl->OnlyHasDefaultOutputDevice = 1;
    1.23      impl->ProvidesOwnCallbackThread = 1;
    1.24      impl->SkipMixerLock = 1;
     2.1 --- a/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Jul 13 22:55:54 2007 +0000
     2.2 +++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Jul 13 23:58:22 2007 +0000
     2.3 @@ -427,8 +427,8 @@
     2.4      /* Set the function pointers */
     2.5      impl->OpenDevice = MINTGSXB_OpenDevice;
     2.6      impl->CloseDevice = MINTGSXB_CloseDevice;
     2.7 -    impl->LockAudio = MINTGSXB_LockAudio;
     2.8 -    impl->UnlockAudio = MINTGSXB_UnlockAudio;
     2.9 +    impl->LockDevice = MINTGSXB_LockDevice;
    2.10 +    impl->UnlockDevice = MINTGSXB_UnlockDevice;
    2.11      impl->OnlyHasDefaultOutputDevice = 1;
    2.12      impl->ProvidesOwnCallbackThread = 1;
    2.13      impl->SkipMixerLock = 1;
     3.1 --- a/src/audio/mint/SDL_mintaudio_it.S	Fri Jul 13 22:55:54 2007 +0000
     3.2 +++ b/src/audio/mint/SDL_mintaudio_it.S	Fri Jul 13 23:58:22 2007 +0000
     3.3 @@ -78,7 +78,7 @@
     3.4  
     3.5  	/* Check if we are not already running */
     3.6  	tstw	_SDL_MintAudio_mutex
     3.7 -	bnes	SDL_MintAudio_XbiosEnd
     3.8 +	bne	SDL_MintAudio_XbiosEnd
     3.9  	notw	_SDL_MintAudio_mutex
    3.10  	
    3.11  	/* Swap buffers */
    3.12 @@ -152,7 +152,7 @@
    3.13  
    3.14  	/* Check if we are not already running */
    3.15  	tstw	_SDL_MintAudio_mutex
    3.16 -	bnes	SDL_MintAudio_Dma8End
    3.17 +	bne	SDL_MintAudio_Dma8End
    3.18  	notw	_SDL_MintAudio_mutex
    3.19  	
    3.20  	/* Swap buffers */
     4.1 --- a/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Jul 13 22:55:54 2007 +0000
     4.2 +++ b/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Jul 13 23:58:22 2007 +0000
     4.3 @@ -384,8 +384,8 @@
     4.4      /* Set the function pointers */
     4.5      impl->OpenDevice = MINTMCSN_OpenDevice;
     4.6      impl->CloseDevice = MINTMCSN_CloseDevice;
     4.7 -    impl->LockAudio = MINTMCSN_LockAudio;
     4.8 -    impl->UnlockAudio = MINTMCSN_UnlockAudio;
     4.9 +    impl->LockDevice = MINTMCSN_LockDevice;
    4.10 +    impl->UnlockDevice = MINTMCSN_UnlockDevice;
    4.11      impl->OnlyHasDefaultOutputDevice = 1;
    4.12      impl->ProvidesOwnCallbackThread = 1;
    4.13      impl->SkipMixerLock = 1;
     5.1 --- a/src/audio/mint/SDL_mintaudio_stfa.c	Fri Jul 13 22:55:54 2007 +0000
     5.2 +++ b/src/audio/mint/SDL_mintaudio_stfa.c	Fri Jul 13 23:58:22 2007 +0000
     5.3 @@ -239,8 +239,8 @@
     5.4      SDL_MintAudio_audiobuf[0] =
     5.5          Atari_SysMalloc(this->spec.size * 2, MX_STRAM);
     5.6      if (SDL_MintAudio_audiobuf[0] == NULL) {
     5.7 -        SDL_OutOfMemory()
     5.8 -            SDL_free(this->hidden);
     5.9 +        SDL_OutOfMemory();
    5.10 +        SDL_free(this->hidden);
    5.11          this->hidden = NULL;
    5.12          return 0;
    5.13      }
    5.14 @@ -291,8 +291,8 @@
    5.15      /* Set the function pointers */
    5.16      impl->OpenDevice = MINTSTFA_OpenDevice;
    5.17      impl->CloseDevice = MINTSTFA_CloseDevice;
    5.18 -    impl->LockAudio = MINTSTFA_LockAudio;
    5.19 -    impl->UnlockAudio = MINTSTFA_UnlockAudio;
    5.20 +    impl->LockDevice = MINTSTFA_LockDevice;
    5.21 +    impl->UnlockDevice = MINTSTFA_UnlockDevice;
    5.22      impl->OnlyHasDefaultOutputDevice = 1;
    5.23      impl->ProvidesOwnCallbackThread = 1;
    5.24      impl->SkipMixerLock = 1;
     6.1 --- a/src/audio/mint/SDL_mintaudio_xbios.c	Fri Jul 13 22:55:54 2007 +0000
     6.2 +++ b/src/audio/mint/SDL_mintaudio_xbios.c	Fri Jul 13 23:58:22 2007 +0000
     6.3 @@ -484,8 +484,8 @@
     6.4      /* Set the function pointers */
     6.5      impl->OpenDevice = MINTXBIOS_OpenDevice;
     6.6      impl->CloseDevice = MINTXBIOS_CloseDevice;
     6.7 -    impl->LockAudio = MINTXBIOS_LockAudio;
     6.8 -    impl->UnlockAudio = MINTXBIOS_UnlockAudio;
     6.9 +    impl->LockDevice = MINTXBIOS_LockDevice;
    6.10 +    impl->UnlockDevice = MINTXBIOS_UnlockDevice;
    6.11      impl->OnlyHasDefaultOutputDevice = 1;
    6.12      impl->ProvidesOwnCallbackThread = 1;
    6.13      impl->SkipMixerLock = 1;