Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio.c @ 1135:cf6133247d34
Mac Classic and CodeWarrior patches.
--ryan.
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Subject: Re: [SDL] Updated Mac patch
Date: Tue, 6 Sep 2005 15:21:27 +0200
To: A list for developers using the SDL library <sdl@libsdl.org>
Earlier, I wrote:
> 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.
>
> Haven't completed any new packaging or projects for Xcode/PB,
> but it seems to build and install fine here (in development).
Tested the new patch to build with old CodeWarrior and MPW,
and it seems it needed some hacks with those old headers...
Just in case you want to support the archeological versions -
here is a small add-on to the above patch, to fix those...
http://www.algonet.se/~afb/SDL-1.2.9-classic.patch
I couldn't get the old CW5 projects to build without a few
modifications - such as deleting the stray old header in:
"CWprojects/Support/Carbon/Include/ConditionalMacros.h" ?
But I updated both projects to CW6 too and built for Carbon,
and it ran all of the Mac test projects without any problems.
The MPW file seems to have compiled, with a small order change.
As long as you're still shipping the CWProjects and MPWmake
with the download, they should probably be updated/fixed ?
(another "solution" would of course be to just delete them)
I'll post my new projects along with the new Xcode projects
later on, along with XML exports of the various .mcp files.
(CW5 builds for Classic / "PPC", and CW6 builds for Carbon)
It'll be packaged as a part of the next SpriteWorld X release...
http://spriteworldx.sourceforge.net/ [Classic/Carbon/Win/X11]
--anders
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Thu, 08 Sep 2005 06:34:28 +0000 |
parents | 080ed9ef0609 |
children | 3692456e7b0f |
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 */ /* Audio interrupt variables and callback function Patrice Mandin */ #include <string.h> #include <unistd.h> #include <mint/osbind.h> #include <mint/falcon.h> #include <mint/mintbind.h> #include "SDL_types.h" #include "SDL_audio.h" #include "SDL_mintaudio.h" #include "SDL_mintaudio_stfa.h" /* The audio device */ SDL_AudioDevice *SDL_MintAudio_device; Uint8 *SDL_MintAudio_audiobuf[2]; /* Pointers to buffers */ unsigned long SDL_MintAudio_audiosize; /* Length of audio buffer=spec->size */ unsigned short SDL_MintAudio_numbuf; /* Buffer to play */ unsigned short SDL_MintAudio_mutex; unsigned long SDL_MintAudio_clocktics; cookie_stfa_t *SDL_MintAudio_stfa; /* MiNT thread variables */ SDL_bool SDL_MintAudio_mint_present; SDL_bool SDL_MintAudio_quit_thread; SDL_bool SDL_MintAudio_thread_finished; long SDL_MintAudio_thread_pid; /* The callback function, called by each driver whenever needed */ void SDL_MintAudio_Callback(void) { Uint8 *buffer; SDL_AudioDevice *audio = SDL_MintAudio_device; buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; memset(buffer, audio->spec.silence, audio->spec.size); if (audio->paused) return; if (audio->convert.needed) { int silence; if ( audio->convert.src_format == AUDIO_U8 ) { silence = 0x80; } else { silence = 0; } memset(audio->convert.buf, silence, audio->convert.len); audio->spec.callback(audio->spec.userdata, (Uint8 *)audio->convert.buf,audio->convert.len); SDL_ConvertAudio(&audio->convert); memcpy(buffer, audio->convert.buf, audio->convert.len_cvt); } else { audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size); } } /* Add a new frequency/clock/predivisor to the current list */ void SDL_MintAudio_AddFrequency(_THIS, Uint32 frequency, Uint32 clock, Uint32 prediv, int gpio_bits) { int i, p; if (MINTAUDIO_freqcount==MINTAUDIO_maxfreqs) { return; } /* Search where to insert the frequency (highest first) */ for (p=0; p<MINTAUDIO_freqcount; p++) { if (frequency > MINTAUDIO_frequencies[p].frequency) { break; } } /* Put all following ones farer */ if (MINTAUDIO_freqcount>0) { for (i=MINTAUDIO_freqcount; i>p; i--) { memcpy(&MINTAUDIO_frequencies[i], &MINTAUDIO_frequencies[i-1], sizeof(mint_frequency_t)); } } /* And insert new one */ MINTAUDIO_frequencies[p].frequency = frequency; MINTAUDIO_frequencies[p].masterclock = clock; MINTAUDIO_frequencies[p].predivisor = prediv; MINTAUDIO_frequencies[p].gpio_bits = gpio_bits; MINTAUDIO_freqcount++; } /* Search for the nearest frequency */ int SDL_MintAudio_SearchFrequency(_THIS, int desired_freq) { int i; /* Only 1 freq ? */ if (MINTAUDIO_freqcount==1) { return 0; } /* Check the array */ for (i=0; i<MINTAUDIO_freqcount; i++) { if (desired_freq >= ((MINTAUDIO_frequencies[i].frequency+ MINTAUDIO_frequencies[i+1].frequency)>>1)) { return i; } } /* Not in the array, give the latest */ return MINTAUDIO_freqcount-1; } /* The thread function, used under MiNT with xbios */ int SDL_MintAudio_Thread(long param) { SndBufPtr pointers; SDL_bool buffers_filled[2] = {SDL_FALSE, SDL_FALSE}; SDL_MintAudio_thread_finished = SDL_FALSE; while (!SDL_MintAudio_quit_thread) { if (Buffptr(&pointers)!=0) continue; if (( (unsigned long)pointers.play>=(unsigned long)SDL_MintAudio_audiobuf[0]) && ( (unsigned long)pointers.play<=(unsigned long)SDL_MintAudio_audiobuf[1])) { /* DMA is reading buffer #0, setup buffer #1 if not already done */ if (!buffers_filled[1]) { SDL_MintAudio_numbuf = 1; SDL_MintAudio_Callback(); Setbuffer(0, SDL_MintAudio_audiobuf[1], SDL_MintAudio_audiobuf[1] + SDL_MintAudio_audiosize); buffers_filled[1]=SDL_TRUE; buffers_filled[0]=SDL_FALSE; } } else { /* DMA is reading buffer #1, setup buffer #0 if not already done */ if (!buffers_filled[0]) { SDL_MintAudio_numbuf = 0; SDL_MintAudio_Callback(); Setbuffer(0, SDL_MintAudio_audiobuf[0], SDL_MintAudio_audiobuf[0] + SDL_MintAudio_audiosize); buffers_filled[0]=SDL_TRUE; buffers_filled[1]=SDL_FALSE; } } usleep(100); } SDL_MintAudio_thread_finished = SDL_TRUE; return 0; } void SDL_MintAudio_WaitThread(void) { if (!SDL_MintAudio_mint_present) return; if (SDL_MintAudio_thread_finished) return; SDL_MintAudio_quit_thread = SDL_TRUE; while (!SDL_MintAudio_thread_finished) { Syield(); } }