Rename LockAudio,UnlockAudio to LockDevice,UnlockDevice. Also some small fixes
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402518
This commit is contained in:
parent
39a207a501
commit
5eb122882e
6 changed files with 16 additions and 16 deletions
|
@ -113,8 +113,8 @@ MINTDMA8_CloseDevice(_THIS)
|
||||||
}
|
}
|
||||||
|
|
||||||
DEBUG_PRINT((DEBUG_NAME "closeaudio: buffers freed\n"));
|
DEBUG_PRINT((DEBUG_NAME "closeaudio: buffers freed\n"));
|
||||||
SDL_free(this->buffer);
|
SDL_free(this->hidden);
|
||||||
this->buffer = NULL;
|
this->hidden = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -332,8 +332,8 @@ MINTDMA8_Init(SDL_AudioDriverImpl * impl)
|
||||||
/* Set the function pointers */
|
/* Set the function pointers */
|
||||||
impl->OpenDevice = MINTDMA8_OpenDevice;
|
impl->OpenDevice = MINTDMA8_OpenDevice;
|
||||||
impl->CloseDevice = MINTDMA8_CloseDevice;
|
impl->CloseDevice = MINTDMA8_CloseDevice;
|
||||||
impl->LockAudio = MINTDMA8_LockAudio;
|
impl->LockDevice = MINTDMA8_LockDevice;
|
||||||
impl->UnlockAudio = MINTDMA8_UnlockAudio;
|
impl->UnlockDevice = MINTDMA8_UnlockDevice;
|
||||||
impl->OnlyHasDefaultOutputDevice = 1;
|
impl->OnlyHasDefaultOutputDevice = 1;
|
||||||
impl->ProvidesOwnCallbackThread = 1;
|
impl->ProvidesOwnCallbackThread = 1;
|
||||||
impl->SkipMixerLock = 1;
|
impl->SkipMixerLock = 1;
|
||||||
|
|
|
@ -427,8 +427,8 @@ MINTGSXB_Init(SDL_AudioDriverImpl * impl)
|
||||||
/* Set the function pointers */
|
/* Set the function pointers */
|
||||||
impl->OpenDevice = MINTGSXB_OpenDevice;
|
impl->OpenDevice = MINTGSXB_OpenDevice;
|
||||||
impl->CloseDevice = MINTGSXB_CloseDevice;
|
impl->CloseDevice = MINTGSXB_CloseDevice;
|
||||||
impl->LockAudio = MINTGSXB_LockAudio;
|
impl->LockDevice = MINTGSXB_LockDevice;
|
||||||
impl->UnlockAudio = MINTGSXB_UnlockAudio;
|
impl->UnlockDevice = MINTGSXB_UnlockDevice;
|
||||||
impl->OnlyHasDefaultOutputDevice = 1;
|
impl->OnlyHasDefaultOutputDevice = 1;
|
||||||
impl->ProvidesOwnCallbackThread = 1;
|
impl->ProvidesOwnCallbackThread = 1;
|
||||||
impl->SkipMixerLock = 1;
|
impl->SkipMixerLock = 1;
|
||||||
|
|
|
@ -78,7 +78,7 @@ _SDL_MintAudio_XbiosInterrupt:
|
||||||
|
|
||||||
/* Check if we are not already running */
|
/* Check if we are not already running */
|
||||||
tstw _SDL_MintAudio_mutex
|
tstw _SDL_MintAudio_mutex
|
||||||
bnes SDL_MintAudio_XbiosEnd
|
bne SDL_MintAudio_XbiosEnd
|
||||||
notw _SDL_MintAudio_mutex
|
notw _SDL_MintAudio_mutex
|
||||||
|
|
||||||
/* Swap buffers */
|
/* Swap buffers */
|
||||||
|
@ -152,7 +152,7 @@ _SDL_MintAudio_Dma8Interrupt:
|
||||||
|
|
||||||
/* Check if we are not already running */
|
/* Check if we are not already running */
|
||||||
tstw _SDL_MintAudio_mutex
|
tstw _SDL_MintAudio_mutex
|
||||||
bnes SDL_MintAudio_Dma8End
|
bne SDL_MintAudio_Dma8End
|
||||||
notw _SDL_MintAudio_mutex
|
notw _SDL_MintAudio_mutex
|
||||||
|
|
||||||
/* Swap buffers */
|
/* Swap buffers */
|
||||||
|
|
|
@ -384,8 +384,8 @@ MINTMCSN_Init(SDL_AudioDriverImpl * impl)
|
||||||
/* Set the function pointers */
|
/* Set the function pointers */
|
||||||
impl->OpenDevice = MINTMCSN_OpenDevice;
|
impl->OpenDevice = MINTMCSN_OpenDevice;
|
||||||
impl->CloseDevice = MINTMCSN_CloseDevice;
|
impl->CloseDevice = MINTMCSN_CloseDevice;
|
||||||
impl->LockAudio = MINTMCSN_LockAudio;
|
impl->LockDevice = MINTMCSN_LockDevice;
|
||||||
impl->UnlockAudio = MINTMCSN_UnlockAudio;
|
impl->UnlockDevice = MINTMCSN_UnlockDevice;
|
||||||
impl->OnlyHasDefaultOutputDevice = 1;
|
impl->OnlyHasDefaultOutputDevice = 1;
|
||||||
impl->ProvidesOwnCallbackThread = 1;
|
impl->ProvidesOwnCallbackThread = 1;
|
||||||
impl->SkipMixerLock = 1;
|
impl->SkipMixerLock = 1;
|
||||||
|
|
|
@ -239,8 +239,8 @@ MINTSTFA_OpenDevice(_THIS, const char *devname, int iscapture)
|
||||||
SDL_MintAudio_audiobuf[0] =
|
SDL_MintAudio_audiobuf[0] =
|
||||||
Atari_SysMalloc(this->spec.size * 2, MX_STRAM);
|
Atari_SysMalloc(this->spec.size * 2, MX_STRAM);
|
||||||
if (SDL_MintAudio_audiobuf[0] == NULL) {
|
if (SDL_MintAudio_audiobuf[0] == NULL) {
|
||||||
SDL_OutOfMemory()
|
SDL_OutOfMemory();
|
||||||
SDL_free(this->hidden);
|
SDL_free(this->hidden);
|
||||||
this->hidden = NULL;
|
this->hidden = NULL;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -291,8 +291,8 @@ MINTSTFA_Init(SDL_AudioDriverImpl * impl)
|
||||||
/* Set the function pointers */
|
/* Set the function pointers */
|
||||||
impl->OpenDevice = MINTSTFA_OpenDevice;
|
impl->OpenDevice = MINTSTFA_OpenDevice;
|
||||||
impl->CloseDevice = MINTSTFA_CloseDevice;
|
impl->CloseDevice = MINTSTFA_CloseDevice;
|
||||||
impl->LockAudio = MINTSTFA_LockAudio;
|
impl->LockDevice = MINTSTFA_LockDevice;
|
||||||
impl->UnlockAudio = MINTSTFA_UnlockAudio;
|
impl->UnlockDevice = MINTSTFA_UnlockDevice;
|
||||||
impl->OnlyHasDefaultOutputDevice = 1;
|
impl->OnlyHasDefaultOutputDevice = 1;
|
||||||
impl->ProvidesOwnCallbackThread = 1;
|
impl->ProvidesOwnCallbackThread = 1;
|
||||||
impl->SkipMixerLock = 1;
|
impl->SkipMixerLock = 1;
|
||||||
|
|
|
@ -484,8 +484,8 @@ MINTXBIOS_Init(SDL_AudioDriverImpl * impl)
|
||||||
/* Set the function pointers */
|
/* Set the function pointers */
|
||||||
impl->OpenDevice = MINTXBIOS_OpenDevice;
|
impl->OpenDevice = MINTXBIOS_OpenDevice;
|
||||||
impl->CloseDevice = MINTXBIOS_CloseDevice;
|
impl->CloseDevice = MINTXBIOS_CloseDevice;
|
||||||
impl->LockAudio = MINTXBIOS_LockAudio;
|
impl->LockDevice = MINTXBIOS_LockDevice;
|
||||||
impl->UnlockAudio = MINTXBIOS_UnlockAudio;
|
impl->UnlockDevice = MINTXBIOS_UnlockDevice;
|
||||||
impl->OnlyHasDefaultOutputDevice = 1;
|
impl->OnlyHasDefaultOutputDevice = 1;
|
||||||
impl->ProvidesOwnCallbackThread = 1;
|
impl->ProvidesOwnCallbackThread = 1;
|
||||||
impl->SkipMixerLock = 1;
|
impl->SkipMixerLock = 1;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue