Mercurial > sdl-ios-xcode
view src/audio/esd/SDL_esdaudio.c @ 1133:609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
To: SDL Developers <sdl@libsdl.org>
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Date: Mon, 30 May 2005 23:29:04 +0200
Subject: [SDL] Mac OS X Video Drivers [patch]
I've updated/added the Carbon and X11 video drivers
to the Mac OS X port of SDL 1.2 (the CVS version),
and made the Cocoa driver and runtime *optional*.
The default is still Cocoa, and the "Quartz" driver.
But you can now also use "toolbox" for Carbon, and
"x11" for running with Apple's (or other) X11 server:
export SDL_VIDEODRIVER=x11
export SDL_VIDEO_GL_DRIVER=/usr/X11R6/lib/libGL.dylib
It also checks if the frameworks are available, by a:
#include <Carbon/Carbon.h> or #import <Cocoa/Cocoa.h>
(this should make it configure on plain Darwin as well?)
Here are the new configure targets:
--enable-video-cocoa use Cocoa/Quartz video driver default=yes
--enable-video-carbon use Carbon/QuickDraw video driver default=yes
--enable-video-x11 use X11 video driver default=no
./configure --enable-video-cocoa --enable-video-carbon
--enable-video-x11 \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
The Carbon version is just an updated version of the old
SDL driver for Mac OS 9, and could probably be improved...
(but it does work, including the Carbon version of SDLmain)
If you disable cocoa, you can run with -framework Carbon only,
and the C version of SDL_main.c. And if you disable carbon too,
you can still use the X11 version which doesn't require SDLmain.
I updated the DrawSprocket version, but did not include it.
(no blitters or VRAM GWorlds etc. available on OS X anyway)
Besides for Mac OS 9, I don't think there's any use for it ?
And note that any performance on Mac OS X equals OpenGL anyway...
You can get "fair" software SDL results on captured CG displays,
but for decent frame rates you need to be using GL for rendering.
Finally, here is the patch itself:
http://www.algonet.se/~afb/SDL-12CVS-macvideo.patch
--anders
PS. It says "video", but as usual it applies to mouse/keyboard too.
------
To: A list for developers using the SDL library <sdl@libsdl.org>
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Date: Sun, 4 Sep 2005 10:02:15 +0200
Subject: [SDL] Updated Mac patch
Updated the previous Mac patch to disable Carbon by default.
Also "fixed" the SDL.spec again, so that it builds on Darwin.
http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
Also applied fine to SDL12 CVS, when I tried it.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Thu, 08 Sep 2005 06:16:14 +0000 |
parents | 0c892e99b65b |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 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@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif /* Allow access to an ESD network stream mixing buffer */ #ifdef ESD_SUPPORT #include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> #include <signal.h> #include <unistd.h> #include <esd.h> #include "SDL_audio.h" #include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" #include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_esdaudio.h" #ifdef ESD_DYNAMIC #include "SDL_name.h" #include "SDL_loadso.h" #else #define SDL_NAME(X) X #endif /* The tag name used by ESD audio */ #define ESD_DRIVER_NAME "esd" /* Audio driver functions */ static int ESD_OpenAudio(_THIS, SDL_AudioSpec *spec); static void ESD_WaitAudio(_THIS); static void ESD_PlayAudio(_THIS); static Uint8 *ESD_GetAudioBuf(_THIS); static void ESD_CloseAudio(_THIS); #ifdef ESD_DYNAMIC static const char *esd_library = ESD_DYNAMIC; static void *esd_handle = NULL; static int esd_loaded = 0; static int (*SDL_NAME(esd_open_sound))( const char *host ); static int (*SDL_NAME(esd_close))( int esd ); static int (*SDL_NAME(esd_play_stream))( esd_format_t format, int rate, const char *host, const char *name ); static struct { const char *name; void **func; } esd_functions[] = { { "esd_open_sound", (void **)&SDL_NAME(esd_open_sound) }, { "esd_close", (void **)&SDL_NAME(esd_close) }, { "esd_play_stream", (void **)&SDL_NAME(esd_play_stream) }, }; static void UnloadESDLibrary() { if ( esd_loaded ) { SDL_UnloadObject(esd_handle); esd_handle = NULL; esd_loaded = 0; } } static int LoadESDLibrary(void) { int i, retval = -1; esd_handle = SDL_LoadObject(esd_library); if ( esd_handle ) { esd_loaded = 1; retval = 0; for ( i=0; i<SDL_TABLESIZE(esd_functions); ++i ) { *esd_functions[i].func = SDL_LoadFunction(esd_handle, esd_functions[i].name); if ( !*esd_functions[i].func ) { retval = -1; UnloadESDLibrary(); break; } } } return retval; } #else static void UnloadESDLibrary() { return; } static int LoadESDLibrary(void) { return 0; } #endif /* ESD_DYNAMIC */ /* Audio driver bootstrap functions */ static int Audio_Available(void) { int connection; int available; available = 0; if ( LoadESDLibrary() < 0 ) { return available; } connection = SDL_NAME(esd_open_sound)(NULL); if ( connection >= 0 ) { available = 1; SDL_NAME(esd_close)(connection); } UnloadESDLibrary(); return(available); } static void Audio_DeleteDevice(SDL_AudioDevice *device) { free(device->hidden); free(device); UnloadESDLibrary(); } static SDL_AudioDevice *Audio_CreateDevice(int devindex) { SDL_AudioDevice *this; /* Initialize all variables that we clean on shutdown */ LoadESDLibrary(); this = (SDL_AudioDevice *)malloc(sizeof(SDL_AudioDevice)); if ( this ) { memset(this, 0, (sizeof *this)); this->hidden = (struct SDL_PrivateAudioData *) malloc((sizeof *this->hidden)); } if ( (this == NULL) || (this->hidden == NULL) ) { SDL_OutOfMemory(); if ( this ) { free(this); } return(0); } memset(this->hidden, 0, (sizeof *this->hidden)); audio_fd = -1; /* Set the function pointers */ this->OpenAudio = ESD_OpenAudio; this->WaitAudio = ESD_WaitAudio; this->PlayAudio = ESD_PlayAudio; this->GetAudioBuf = ESD_GetAudioBuf; this->CloseAudio = ESD_CloseAudio; this->free = Audio_DeleteDevice; return this; } AudioBootStrap ESD_bootstrap = { ESD_DRIVER_NAME, "Enlightened Sound Daemon", Audio_Available, Audio_CreateDevice }; /* This function waits until it is possible to write a full sound buffer */ static void ESD_WaitAudio(_THIS) { Sint32 ticks; /* Check to see if the thread-parent process is still alive */ { static int cnt = 0; /* Note that this only works with thread implementations that use a different process id for each thread. */ if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */ if ( kill(parent, 0) < 0 ) { this->enabled = 0; } } } /* Use timer for general audio synchronization */ ticks = ((Sint32)(next_frame - SDL_GetTicks()))-FUDGE_TICKS; if ( ticks > 0 ) { SDL_Delay(ticks); } } static void ESD_PlayAudio(_THIS) { int written; /* Write the audio data, checking for EAGAIN on broken audio drivers */ do { written = write(audio_fd, mixbuf, mixlen); if ( (written < 0) && ((errno == 0) || (errno == EAGAIN)) ) { SDL_Delay(1); /* Let a little CPU time go by */ } } while ( (written < 0) && ((errno == 0) || (errno == EAGAIN) || (errno == EINTR)) ); /* Set the next write frame */ next_frame += frame_ticks; /* If we couldn't write, assume fatal error for now */ if ( written < 0 ) { this->enabled = 0; } } static Uint8 *ESD_GetAudioBuf(_THIS) { return(mixbuf); } static void ESD_CloseAudio(_THIS) { if ( mixbuf != NULL ) { SDL_FreeAudioMem(mixbuf); mixbuf = NULL; } if ( audio_fd >= 0 ) { SDL_NAME(esd_close)(audio_fd); audio_fd = -1; } } /* Try to get the name of the program */ static char *get_progname(void) { char *progname = NULL; #ifdef linux FILE *fp; static char temp[BUFSIZ]; sprintf(temp, "/proc/%d/cmdline", getpid()); fp = fopen(temp, "r"); if ( fp != NULL ) { if ( fgets(temp, sizeof(temp)-1, fp) ) { progname = strrchr(temp, '/'); if ( progname == NULL ) { progname = temp; } else { progname = progname+1; } } fclose(fp); } #endif return(progname); } static int ESD_OpenAudio(_THIS, SDL_AudioSpec *spec) { esd_format_t format; /* Convert audio spec to the ESD audio format */ format = (ESD_STREAM | ESD_PLAY); switch ( spec->format & 0xFF ) { case 8: format |= ESD_BITS8; break; case 16: format |= ESD_BITS16; break; default: SDL_SetError("Unsupported ESD audio format"); return(-1); } if ( spec->channels == 1 ) { format |= ESD_MONO; } else { format |= ESD_STEREO; } #if 0 spec->samples = ESD_BUF_SIZE; /* Darn, no way to change this yet */ #endif /* Open a connection to the ESD audio server */ audio_fd = SDL_NAME(esd_play_stream)(format, spec->freq, NULL, get_progname()); if ( audio_fd < 0 ) { SDL_SetError("Couldn't open ESD connection"); return(-1); } /* Calculate the final parameters for this audio specification */ SDL_CalculateAudioSpec(spec); frame_ticks = (float)(spec->samples*1000)/spec->freq; next_frame = SDL_GetTicks()+frame_ticks; /* Allocate mixing buffer */ mixlen = spec->size; mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen); if ( mixbuf == NULL ) { return(-1); } memset(mixbuf, spec->silence, spec->size); /* Get the parent process id (we're the parent of the audio thread) */ parent = getpid(); /* We're ready to rock and roll. :-) */ return(0); } #endif /* ESD_SUPPORT */