Mercurial > sdl-ios-xcode
view src/audio/nas/SDL_nasaudio.c @ 5079:8c88cae7911e SDL-1.2
Michael Bicha to Sam
I came across further issues with SDL 1.2.14 on win32 in combination
with touch screens.
When you touched the screen older SDLs reported
SDL_MOUSEMOTION to the touch position
SDL_MOUSEBUTTONDOWN at the touch position
1.2.14 reports
SDL_MOUSEBUTTONDOWN at the last mouse position before the touch
and then a
SDL_MOUSEMOTION to the touch position
I found that to fix it in the file SDL_sysevents.c i had to put back the
following lines from 1.2.12 to get it working correctly again:
if ( mouse_relative ) {
/* RJR: March 28, 2000
report internal mouse position if in relative mode */
x = 0; y = 0;
} else {
x = (Sint16)LOWORD(lParam);
y = (Sint16)HIWORD(lParam);
#ifdef _WIN32_WCE
if (SDL_VideoSurface)
GapiTransform(this->hidden->userOrientation,
this->hidden->hiresFix, &x, &y);
#endif
}
posted = SDL_PrivateMouseButton(
state, button, x, y);
where there was only
posted = SDL_PrivateMouseButton(
state, button, 0, 0);
in 1.2.14 (appx. line 484)
please feel free to put that change into any SDL lib you like in any way
you like and thanks for your great work !
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sun, 23 Jan 2011 21:02:02 -0800 |
parents | 2f5e884f0a9d |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org This driver was written by: Erik Inge Bolsų knan@mo.himolde.no */ #include "SDL_config.h" /* Allow access to a raw mixing buffer */ #include <signal.h> #include <unistd.h> #include "SDL_timer.h" #include "SDL_audio.h" #include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" #include "SDL_nasaudio.h" #ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC #include "SDL_loadso.h" #endif /* The tag name used by artsc audio */ #define NAS_DRIVER_NAME "nas" static struct SDL_PrivateAudioData *this2 = NULL; static void (*NAS_AuCloseServer) (AuServer *); static void (*NAS_AuNextEvent) (AuServer *, AuBool, AuEvent *); static AuBool(*NAS_AuDispatchEvent) (AuServer *, AuEvent *); static AuFlowID(*NAS_AuCreateFlow) (AuServer *, AuStatus *); static void (*NAS_AuStartFlow) (AuServer *, AuFlowID, AuStatus *); static void (*NAS_AuSetElements) (AuServer *, AuFlowID, AuBool, int, AuElement *, AuStatus *); static void (*NAS_AuWriteElement) (AuServer *, AuFlowID, int, AuUint32, AuPointer, AuBool, AuStatus *); static AuServer *(*NAS_AuOpenServer) (_AuConst char *, int, _AuConst char *, int, _AuConst char *, char **); static AuEventHandlerRec *(*NAS_AuRegisterEventHandler) (AuServer *, AuMask, int, AuID, AuEventHandlerCallback, AuPointer); #ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC static const char *nas_library = SDL_AUDIO_DRIVER_NAS_DYNAMIC; static void *nas_handle = NULL; static int load_nas_sym(const char *fn, void **addr) { *addr = SDL_LoadFunction(nas_handle, fn); if (*addr == NULL) { return 0; } return 1; } /* cast funcs to char* first, to please GCC's strict aliasing rules. */ #define SDL_NAS_SYM(x) \ if (!load_nas_sym(#x, (void **) (char *) &NAS_##x)) return -1 #else #define SDL_NAS_SYM(x) NAS_##x = x #endif static int load_nas_syms(void) { SDL_NAS_SYM(AuCloseServer); SDL_NAS_SYM(AuNextEvent); SDL_NAS_SYM(AuDispatchEvent); SDL_NAS_SYM(AuCreateFlow); SDL_NAS_SYM(AuStartFlow); SDL_NAS_SYM(AuSetElements); SDL_NAS_SYM(AuWriteElement); SDL_NAS_SYM(AuOpenServer); SDL_NAS_SYM(AuRegisterEventHandler); return 0; } #undef SDL_NAS_SYM #ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC static void UnloadNASLibrary(void) { if (nas_handle != NULL) { SDL_UnloadObject(nas_handle); nas_handle = NULL; } } static int LoadNASLibrary(void) { int retval = 0; if (nas_handle == NULL) { nas_handle = SDL_LoadObject(nas_library); if (nas_handle == NULL) { /* Copy error string so we can use it in a new SDL_SetError(). */ char *origerr = SDL_GetError(); size_t len = SDL_strlen(origerr) + 1; char *err = (char *) alloca(len); SDL_strlcpy(err, origerr, len); retval = -1; SDL_SetError("NAS: SDL_LoadObject('%s') failed: %s\n", nas_library, err); } else { retval = load_nas_syms(); if (retval < 0) { UnloadNASLibrary(); } } } return retval; } #else static void UnloadNASLibrary(void) { } static int LoadNASLibrary(void) { load_nas_syms(); return 0; } #endif /* SDL_AUDIO_DRIVER_NAS_DYNAMIC */ /* Audio driver functions */ static int NAS_OpenAudio(_THIS, SDL_AudioSpec *spec); static void NAS_WaitAudio(_THIS); static void NAS_PlayAudio(_THIS); static Uint8 *NAS_GetAudioBuf(_THIS); static void NAS_CloseAudio(_THIS); /* Audio driver bootstrap functions */ static int Audio_Available(void) { if (LoadNASLibrary() == 0) { AuServer *aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); if (!aud) { UnloadNASLibrary(); return 0; } NAS_AuCloseServer(aud); UnloadNASLibrary(); return 1; } return 0; } static void Audio_DeleteDevice(SDL_AudioDevice *device) { UnloadNASLibrary(); SDL_free(device->hidden); SDL_free(device); } static SDL_AudioDevice *Audio_CreateDevice(int devindex) { SDL_AudioDevice *this; if (LoadNASLibrary() < 0) { return NULL; } /* 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 NULL; } SDL_memset(this->hidden, 0, (sizeof *this->hidden)); /* Set the function pointers */ this->OpenAudio = NAS_OpenAudio; this->WaitAudio = NAS_WaitAudio; this->PlayAudio = NAS_PlayAudio; this->GetAudioBuf = NAS_GetAudioBuf; this->CloseAudio = NAS_CloseAudio; this->free = Audio_DeleteDevice; return this; } AudioBootStrap NAS_bootstrap = { NAS_DRIVER_NAME, "Network Audio System", Audio_Available, Audio_CreateDevice }; /* This function waits until it is possible to write a full sound buffer */ static void NAS_WaitAudio(_THIS) { while ( this->hidden->buf_free < this->hidden->mixlen ) { AuEvent ev; NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev); NAS_AuDispatchEvent(this->hidden->aud, &ev); } } static void NAS_PlayAudio(_THIS) { while (this->hidden->mixlen > this->hidden->buf_free) { /* We think the buffer is full? Yikes! Ask the server for events, in the hope that some of them is LowWater events telling us more of the buffer is free now than what we think. */ AuEvent ev; NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev); NAS_AuDispatchEvent(this->hidden->aud, &ev); } this->hidden->buf_free -= this->hidden->mixlen; /* Write the audio data */ NAS_AuWriteElement(this->hidden->aud, this->hidden->flow, 0, this->hidden->mixlen, this->hidden->mixbuf, AuFalse, NULL); this->hidden->written += this->hidden->mixlen; #ifdef DEBUG_AUDIO fprintf(stderr, "Wrote %d bytes of audio data\n", this->hidden->mixlen); #endif } static Uint8 *NAS_GetAudioBuf(_THIS) { return(this->hidden->mixbuf); } static void NAS_CloseAudio(_THIS) { if ( this->hidden->mixbuf != NULL ) { SDL_FreeAudioMem(this->hidden->mixbuf); this->hidden->mixbuf = NULL; } if ( this->hidden->aud ) { NAS_AuCloseServer(this->hidden->aud); this->hidden->aud = 0; } } static unsigned char sdlformat_to_auformat(unsigned int fmt) { switch (fmt) { case AUDIO_U8: return AuFormatLinearUnsigned8; case AUDIO_S8: return AuFormatLinearSigned8; case AUDIO_U16LSB: return AuFormatLinearUnsigned16LSB; case AUDIO_U16MSB: return AuFormatLinearUnsigned16MSB; case AUDIO_S16LSB: return AuFormatLinearSigned16LSB; case AUDIO_S16MSB: return AuFormatLinearSigned16MSB; } return AuNone; } static AuBool event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) { switch (ev->type) { case AuEventTypeElementNotify: { AuElementNotifyEvent* event = (AuElementNotifyEvent *)ev; switch (event->kind) { case AuElementNotifyKindLowWater: if (this2->buf_free >= 0) { this2->really += event->num_bytes; gettimeofday(&this2->last_tv, 0); this2->buf_free += event->num_bytes; } else { this2->buf_free = event->num_bytes; } break; case AuElementNotifyKindState: switch (event->cur_state) { case AuStatePause: if (event->reason != AuReasonUser) { if (this2->buf_free >= 0) { this2->really += event->num_bytes; gettimeofday(&this2->last_tv, 0); this2->buf_free += event->num_bytes; } else { this2->buf_free = event->num_bytes; } } break; } } } } return AuTrue; } static AuDeviceID find_device(_THIS, int nch) { /* These "Au" things are all macros, not functions... */ int i; for (i = 0; i < AuServerNumDevices(this->hidden->aud); i++) { if ((AuDeviceKind(AuServerDevice(this->hidden->aud, i)) == AuComponentKindPhysicalOutput) && AuDeviceNumTracks(AuServerDevice(this->hidden->aud, i)) == nch) { return AuDeviceIdentifier(AuServerDevice(this->hidden->aud, i)); } } return AuNone; } static int NAS_OpenAudio(_THIS, SDL_AudioSpec *spec) { AuElement elms[3]; int buffer_size; Uint16 test_format, format; this->hidden->mixbuf = NULL; /* Try for a closest match on audio format */ format = 0; for ( test_format = SDL_FirstAudioFormat(spec->format); ! format && test_format; ) { format = sdlformat_to_auformat(test_format); if (format == AuNone) { test_format = SDL_NextAudioFormat(); } } if ( format == 0 ) { SDL_SetError("Couldn't find any hardware audio formats"); return(-1); } spec->format = test_format; this->hidden->aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); if (this->hidden->aud == 0) { SDL_SetError("Couldn't open connection to NAS server"); return (-1); } this->hidden->dev = find_device(this, spec->channels); if ((this->hidden->dev == AuNone) || (!(this->hidden->flow = NAS_AuCreateFlow(this->hidden->aud, NULL)))) { NAS_AuCloseServer(this->hidden->aud); this->hidden->aud = 0; SDL_SetError("Couldn't find a fitting playback device on NAS server"); return (-1); } buffer_size = spec->freq; if (buffer_size < 4096) buffer_size = 4096; if (buffer_size > 32768) buffer_size = 32768; /* So that the buffer won't get unmanageably big. */ /* Calculate the final parameters for this audio specification */ SDL_CalculateAudioSpec(spec); this2 = this->hidden; /* These "Au" things without a NAS_ prefix are macros, not functions... */ AuMakeElementImportClient(elms, spec->freq, format, spec->channels, AuTrue, buffer_size, buffer_size / 4, 0, NULL); AuMakeElementExportDevice(elms+1, 0, this->hidden->dev, spec->freq, AuUnlimitedSamples, 0, NULL); NAS_AuSetElements(this->hidden->aud, this->hidden->flow, AuTrue, 2, elms, NULL); NAS_AuRegisterEventHandler(this->hidden->aud, AuEventHandlerIDMask, 0, this->hidden->flow, event_handler, (AuPointer) NULL); NAS_AuStartFlow(this->hidden->aud, this->hidden->flow, NULL); /* Allocate mixing buffer */ this->hidden->mixlen = spec->size; this->hidden->mixbuf = (Uint8 *)SDL_AllocAudioMem(this->hidden->mixlen); if ( this->hidden->mixbuf == NULL ) { return(-1); } SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); /* Get the parent process id (we're the parent of the audio thread) */ this->hidden->parent = getpid(); /* We're ready to rock and roll. :-) */ return(0); }