Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40655
This commit is contained in:
parent
4c8805d5ab
commit
311d6a8f61
14 changed files with 856 additions and 20 deletions
|
@ -5,8 +5,28 @@ noinst_LTLIBRARIES = libaudio.la
|
|||
|
||||
# Define which subdirectories need to be built
|
||||
SUBDIRS = @AUDIO_SUBDIRS@
|
||||
DIST_SUBDIRS = alsa arts baudio dma dmedia dsp esd macrom nas nto openbsd \
|
||||
paudio riscos sun ums windib windx5 disk mint dc
|
||||
DIST_SUBDIRS = \
|
||||
alsa \
|
||||
arts \
|
||||
baudio \
|
||||
dc \
|
||||
disk \
|
||||
dma \
|
||||
dmedia \
|
||||
dsp \
|
||||
esd \
|
||||
macrom \
|
||||
mint \
|
||||
mme \
|
||||
nas \
|
||||
nto \
|
||||
openbsd \
|
||||
paudio \
|
||||
riscos \
|
||||
sun \
|
||||
ums \
|
||||
windib \
|
||||
windx5
|
||||
|
||||
DRIVERS = @AUDIO_DRIVERS@
|
||||
|
||||
|
|
|
@ -83,6 +83,9 @@ static AudioBootStrap *bootstrap[] = {
|
|||
#ifdef ENABLE_AHI
|
||||
&AHI_bootstrap,
|
||||
#endif
|
||||
#ifdef MMEAUDIO_SUPPORT
|
||||
&MMEAUDIO_bootstrap,
|
||||
#endif
|
||||
#ifdef MINTAUDIO_SUPPORT
|
||||
&MINTAUDIO_GSXB_bootstrap,
|
||||
&MINTAUDIO_MCSN_bootstrap,
|
||||
|
|
|
@ -163,6 +163,9 @@ extern AudioBootStrap DCAUD_bootstrap;
|
|||
#ifdef DRENDERER_SUPPORT
|
||||
extern AudioBootStrap DRENDERER_bootstrap;
|
||||
#endif
|
||||
#ifdef MMEAUDIO_SUPPORT
|
||||
extern AudioBootStrap MMEAUDIO_bootstrap;
|
||||
#endif
|
||||
|
||||
/* This is the current audio device */
|
||||
extern SDL_AudioDevice *current_audio;
|
||||
|
|
6
src/audio/mme/.cvsignore
Normal file
6
src/audio/mme/.cvsignore
Normal file
|
@ -0,0 +1,6 @@
|
|||
Makefile.in
|
||||
Makefile
|
||||
.libs
|
||||
*.o
|
||||
*.lo
|
||||
*.la
|
9
src/audio/mme/Makefile.am
Normal file
9
src/audio/mme/Makefile.am
Normal file
|
@ -0,0 +1,9 @@
|
|||
|
||||
## Makefile.am for SDL using the Tru64 MME sound driver
|
||||
|
||||
noinst_LTLIBRARIES = libaudio_mme.la
|
||||
libaudio_mme_la_SOURCES = $(SRCS)
|
||||
|
||||
# The SDL audio driver sources
|
||||
SRCS = SDL_mmeaudio.c \
|
||||
SDL_mmeaudio.h
|
256
src/audio/mme/SDL_mmeaudio.c
Normal file
256
src/audio/mme/SDL_mmeaudio.c
Normal file
|
@ -0,0 +1,256 @@
|
|||
/*
|
||||
SDL - Simple DirectMedia Layer
|
||||
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 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
|
||||
*/
|
||||
|
||||
/* Tru64 UNIX MME support */
|
||||
#include "SDL_mmeaudio.h"
|
||||
|
||||
static BOOL inUse[NUM_BUFFERS];
|
||||
|
||||
/* Audio driver functions */
|
||||
static int MME_OpenAudio(_THIS, SDL_AudioSpec *spec);
|
||||
static void MME_WaitAudio(_THIS);
|
||||
static Uint8 *MME_GetAudioBuf(_THIS);
|
||||
static void MME_PlayAudio(_THIS);
|
||||
static void MME_WaitDone(_THIS);
|
||||
static void MME_CloseAudio(_THIS);
|
||||
|
||||
/* Audio driver bootstrap functions */
|
||||
static int Audio_Available(void)
|
||||
{
|
||||
return(1);
|
||||
}
|
||||
|
||||
static void Audio_DeleteDevice(SDL_AudioDevice *device)
|
||||
{
|
||||
if ( device ) {
|
||||
if ( device->hidden ) {
|
||||
free(device->hidden);
|
||||
device->hidden = NULL;
|
||||
}
|
||||
free(device);
|
||||
device = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static SDL_AudioDevice *Audio_CreateDevice(int devindex)
|
||||
{
|
||||
SDL_AudioDevice *this;
|
||||
|
||||
/* Initialize all variables that we clean on shutdown */
|
||||
this = malloc(sizeof(SDL_AudioDevice));
|
||||
if ( this ) {
|
||||
memset(this, 0, (sizeof *this));
|
||||
this->hidden = 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));
|
||||
/* Set the function pointers */
|
||||
this->OpenAudio = MME_OpenAudio;
|
||||
this->WaitAudio = MME_WaitAudio;
|
||||
this->PlayAudio = MME_PlayAudio;
|
||||
this->GetAudioBuf = MME_GetAudioBuf;
|
||||
this->WaitDone = MME_WaitDone;
|
||||
this->CloseAudio = MME_CloseAudio;
|
||||
this->free = Audio_DeleteDevice;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
AudioBootStrap MMEAUDIO_bootstrap = {
|
||||
"waveout", "Tru64 MME WaveOut",
|
||||
Audio_Available, Audio_CreateDevice
|
||||
};
|
||||
|
||||
static void SetMMerror(char *function, MMRESULT code)
|
||||
{
|
||||
int len;
|
||||
char errbuf[MAXERRORLENGTH];
|
||||
|
||||
sprintf(errbuf, "%s: ", function);
|
||||
len = strlen(errbuf);
|
||||
waveOutGetErrorText(code, errbuf+len, MAXERRORLENGTH-len);
|
||||
SDL_SetError("%s",errbuf);
|
||||
}
|
||||
|
||||
static void CALLBACK MME_CALLBACK(HWAVEOUT hwo,
|
||||
UINT uMsg,
|
||||
DWORD dwInstance,
|
||||
LPARAM dwParam1,
|
||||
LPARAM dwParam2)
|
||||
{
|
||||
WAVEHDR *wp = (WAVEHDR *) dwParam1;
|
||||
|
||||
if ( uMsg == WOM_DONE )
|
||||
inUse[wp->dwUser] = FALSE;
|
||||
}
|
||||
|
||||
static int MME_OpenAudio(_THIS, SDL_AudioSpec *spec)
|
||||
{
|
||||
MMRESULT result;
|
||||
int i;
|
||||
|
||||
mixbuf = NULL;
|
||||
|
||||
/* Set basic WAVE format parameters */
|
||||
shm = mmeAllocMem(sizeof(*shm));
|
||||
if ( shm == NULL ) {
|
||||
SDL_SetError("Out of memory: shm");
|
||||
return(-1);
|
||||
}
|
||||
shm->sound = 0;
|
||||
shm->wFmt.wf.wFormatTag = WAVE_FORMAT_PCM;
|
||||
|
||||
/* Determine the audio parameters from the AudioSpec */
|
||||
switch ( spec->format & 0xFF ) {
|
||||
case 8:
|
||||
/* Unsigned 8 bit audio data */
|
||||
spec->format = AUDIO_U8;
|
||||
shm->wFmt.wBitsPerSample = 8;
|
||||
break;
|
||||
case 16:
|
||||
/* Signed 16 bit audio data */
|
||||
spec->format = AUDIO_S16;
|
||||
shm->wFmt.wBitsPerSample = 16;
|
||||
break;
|
||||
default:
|
||||
SDL_SetError("Unsupported audio format");
|
||||
return(-1);
|
||||
}
|
||||
|
||||
shm->wFmt.wf.nChannels = spec->channels;
|
||||
shm->wFmt.wf.nSamplesPerSec = spec->freq;
|
||||
shm->wFmt.wf.nBlockAlign =
|
||||
shm->wFmt.wf.nChannels * shm->wFmt.wBitsPerSample / 8;
|
||||
shm->wFmt.wf.nAvgBytesPerSec =
|
||||
shm->wFmt.wf.nSamplesPerSec * shm->wFmt.wf.nBlockAlign;
|
||||
|
||||
/* Check the buffer size -- minimum of 1/4 second (word aligned) */
|
||||
if ( spec->samples < (spec->freq/4) )
|
||||
spec->samples = ((spec->freq/4)+3)&~3;
|
||||
|
||||
/* Update the fragment size as size in bytes */
|
||||
SDL_CalculateAudioSpec(spec);
|
||||
|
||||
/* Open the audio device */
|
||||
result = waveOutOpen(&(shm->sound),
|
||||
WAVE_MAPPER,
|
||||
&(shm->wFmt.wf),
|
||||
MME_CALLBACK,
|
||||
NULL,
|
||||
(CALLBACK_FUNCTION|WAVE_OPEN_SHAREABLE));
|
||||
if ( result != MMSYSERR_NOERROR ) {
|
||||
SetMMerror("waveOutOpen()", result);
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* Create the sound buffers */
|
||||
mixbuf = (Uint8 *)mmeAllocBuffer(NUM_BUFFERS * (spec->size));
|
||||
if ( mixbuf == NULL ) {
|
||||
SDL_SetError("Out of memory: mixbuf");
|
||||
return(-1);
|
||||
}
|
||||
|
||||
for (i = 0; i < NUM_BUFFERS; i++) {
|
||||
shm->wHdr[i].lpData = &mixbuf[i * (spec->size)];
|
||||
shm->wHdr[i].dwBufferLength = spec->size;
|
||||
shm->wHdr[i].dwFlags = 0;
|
||||
shm->wHdr[i].dwUser = i;
|
||||
shm->wHdr[i].dwLoops = 0; /* loop control counter */
|
||||
shm->wHdr[i].lpNext = NULL; /* reserved for driver */
|
||||
shm->wHdr[i].reserved = 0;
|
||||
inUse[i] = FALSE;
|
||||
}
|
||||
next_buffer = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void MME_WaitAudio(_THIS)
|
||||
{
|
||||
mmeWaitForCallbacks ();
|
||||
mmeProcessCallbacks ();
|
||||
}
|
||||
|
||||
static Uint8 *MME_GetAudioBuf(_THIS)
|
||||
{
|
||||
Uint8 *retval;
|
||||
|
||||
while ( inUse[next_buffer] )
|
||||
;
|
||||
|
||||
inUse[next_buffer] = TRUE;
|
||||
retval = (Uint8 *)(shm->wHdr[next_buffer].lpData);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static void MME_PlayAudio(_THIS)
|
||||
{
|
||||
/* Queue it up */
|
||||
waveOutWrite(shm->sound, &(shm->wHdr[next_buffer]), sizeof(WAVEHDR));
|
||||
next_buffer = (next_buffer+1)%NUM_BUFFERS;
|
||||
}
|
||||
|
||||
static void MME_WaitDone(_THIS)
|
||||
{
|
||||
MMRESULT result;
|
||||
int i;
|
||||
|
||||
if ( shm->sound ) {
|
||||
result = waveOutReset(shm->sound);
|
||||
if ( result != MMSYSERR_NOERROR )
|
||||
SetMMerror("waveOutReset()", result);
|
||||
else {
|
||||
mmeWaitForCallbacks ();
|
||||
mmeProcessCallbacks ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void MME_CloseAudio(_THIS)
|
||||
{
|
||||
MMRESULT result;
|
||||
|
||||
if ( mixbuf ) {
|
||||
result = mmeFreeBuffer(mixbuf);
|
||||
if (result != MMSYSERR_NOERROR )
|
||||
SetMMerror("mmeFreeBuffer", result);
|
||||
mixbuf = NULL;
|
||||
}
|
||||
|
||||
if ( shm ) {
|
||||
if ( shm->sound ) {
|
||||
result = waveOutClose(shm->sound);
|
||||
if (result != MMSYSERR_NOERROR )
|
||||
SetMMerror("waveOutClose()", result);
|
||||
}
|
||||
result = mmeFreeMem(shm);
|
||||
if (result != MMSYSERR_NOERROR )
|
||||
SetMMerror("mmeFreeMem()", result);
|
||||
shm = NULL;
|
||||
}
|
||||
}
|
||||
|
59
src/audio/mme/SDL_mmeaudio.h
Normal file
59
src/audio/mme/SDL_mmeaudio.h
Normal file
|
@ -0,0 +1,59 @@
|
|||
/*
|
||||
SDL - Simple DirectMedia Layer
|
||||
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 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
|
||||
*/
|
||||
|
||||
/* Allow access to a raw mixing buffer */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <mme_api.h>
|
||||
|
||||
#include "SDL_audio.h"
|
||||
#include "SDL_mutex.h"
|
||||
#include "SDL_timer.h"
|
||||
#include "SDL_audio_c.h"
|
||||
|
||||
#ifndef _SDL_lowaudio_h
|
||||
#define _SDL_lowaudio_h
|
||||
#include "SDL_sysaudio.h"
|
||||
|
||||
/* Hidden "this" pointer for the video functions */
|
||||
#define _THIS SDL_AudioDevice *this
|
||||
#define NUM_BUFFERS 2
|
||||
|
||||
struct SharedMem {
|
||||
HWAVEOUT sound;
|
||||
WAVEHDR wHdr[NUM_BUFFERS];
|
||||
PCMWAVEFORMAT wFmt;
|
||||
};
|
||||
|
||||
struct SDL_PrivateAudioData {
|
||||
Uint8 *mixbuf; /* The raw allocated mixing buffer */
|
||||
struct SharedMem *shm;
|
||||
int next_buffer;
|
||||
};
|
||||
|
||||
#define shm (this->hidden->shm)
|
||||
#define mixbuf (this->hidden->mixbuf)
|
||||
#define next_buffer (this->hidden->next_buffer)
|
||||
/* Old variable names */
|
||||
#endif /* _SDL_lowaudio_h */
|
6
src/audio/riscos/.cvsignore
Normal file
6
src/audio/riscos/.cvsignore
Normal file
|
@ -0,0 +1,6 @@
|
|||
Makefile.in
|
||||
Makefile
|
||||
.libs
|
||||
*.o
|
||||
*.lo
|
||||
*.la
|
Loading…
Add table
Add a link
Reference in a new issue