Mercurial > sdl-ios-xcode
view src/audio/SDL_sysaudio.h @ 172:37e3ca9254c7
Date: Sat, 8 Sep 2001 04:42:23 +0200
From: Max Horn <max@quendi.de>
Subject: SDL/OSX: Joystick; Better key handling
I just finished implementing improved keyhandling for OS X (in fact
the code should be easily ported to the "normal" MacOS part of SDL, I
just had no chance yet). Works like this:
First init the mapping table statically like before. Them, it queries
the OS for the "official" key table, then iterates over all 127
scancode and gets the associates ascii code. It ignores everythng
below 32 (has to, as it would lead to many problems if we did not...
e.g. both ESC and NUM LOCk produce an ascii code 27 on my keyboard),
and all stuff above 127 is mapped to SDLK_WORLD_* simply in the order
it is encountered.
In addition, caps lock is now working, too.
The code work flawless for me, but since I only have one keyboard, I
may have not encountered some serious problem... but I am pretty
confident that it is better than the old code in most cases.
The joystick driver works fine for me, too. I think it can be added
to CVS already. It would simply be helpful if more people would test
it. Hm, I wonder if Maelstrom or GLTron has Joystick support? That
would be a wonderful test application :)
I also took the liberty of modifying some text files like BUGS,
README.CVS, README.MacOSX (which now contains the OS X docs I long
promised)
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 11 Sep 2001 19:00:18 +0000 |
parents | 8758b8d42cd9 |
children | e8157fcb3114 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@devolution.com */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #ifndef _SDL_sysaudio_h #define _SDL_sysaudio_h #include "SDL_mutex.h" #include "SDL_thread.h" /* The SDL audio driver */ typedef struct SDL_AudioDevice SDL_AudioDevice; /* Define the SDL audio driver structure */ #define _THIS SDL_AudioDevice *_this #ifndef _STATUS #define _STATUS SDL_status *status #endif struct SDL_AudioDevice { /* * * */ /* The name of this audio driver */ const char *name; /* * * */ /* The description of this audio driver */ const char *desc; /* * * */ /* Public driver functions */ int (*OpenAudio)(_THIS, SDL_AudioSpec *spec); void (*ThreadInit)(_THIS); /* Called by audio thread at start */ void (*WaitAudio)(_THIS); void (*PlayAudio)(_THIS); Uint8 *(*GetAudioBuf)(_THIS); void (*WaitDone)(_THIS); void (*CloseAudio)(_THIS); /* * * */ /* Data common to all devices */ /* The current audio specification (shared with audio thread) */ SDL_AudioSpec spec; /* An audio conversion block for audio format emulation */ SDL_AudioCVT convert; /* Current state flags */ int enabled; int paused; int opened; /* Fake audio buffer for when the audio hardware is busy */ Uint8 *fake_stream; /* A semaphore for locking the mixing buffers */ SDL_mutex *mixer_lock; /* A thread to feed the audio device */ SDL_Thread *thread; Uint32 threadid; /* * * */ /* Data private to this driver */ struct SDL_PrivateAudioData *hidden; /* * * */ /* The function used to dispose of this structure */ void (*free)(_THIS); }; #undef _THIS typedef struct AudioBootStrap { const char *name; const char *desc; int (*available)(void); SDL_AudioDevice *(*create)(int devindex); } AudioBootStrap; #ifdef OPENBSD_AUDIO_SUPPORT extern AudioBootStrap OPENBSD_AUDIO_bootstrap; #endif #ifdef OSS_SUPPORT extern AudioBootStrap DSP_bootstrap; extern AudioBootStrap DMA_bootstrap; #endif #ifdef ALSA_SUPPORT extern AudioBootStrap ALSA_bootstrap; #endif #ifdef SUNAUDIO_SUPPORT extern AudioBootStrap SUNAUDIO_bootstrap; #endif #ifdef DMEDIA_SUPPORT extern AudioBootStrap DMEDIA_bootstrap; #endif #ifdef ARTSC_SUPPORT extern AudioBootStrap ARTSC_bootstrap; #endif #ifdef ESD_SUPPORT extern AudioBootStrap ESD_bootstrap; #endif #ifdef NAS_SUPPORT extern AudioBootStrap NAS_bootstrap; #endif #ifdef ENABLE_DIRECTX extern AudioBootStrap DSOUND_bootstrap; #endif #ifdef ENABLE_WINDIB extern AudioBootStrap WAVEOUT_bootstrap; #endif #ifdef _AIX extern AudioBootStrap Paud_bootstrap; #endif #ifdef __BEOS__ extern AudioBootStrap BAUDIO_bootstrap; #endif #if defined(macintosh) || TARGET_API_MAC_CARBON extern AudioBootStrap SNDMGR_bootstrap; #endif #ifdef ENABLE_AHI extern AudioBootStrap AHI_bootstrap; #endif #ifdef DISKAUD_SUPPORT extern AudioBootStrap DISKAUD_bootstrap; #endif /* This is the current audio device */ extern SDL_AudioDevice *current_audio; #endif /* _SDL_sysaudio_h */