Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
  • Loading branch information
slouken committed Jul 22, 2003
1 parent 80b0d8b commit eda1583
Show file tree
Hide file tree
Showing 14 changed files with 856 additions and 20 deletions.
14 changes: 9 additions & 5 deletions configure.in
Expand Up @@ -2170,13 +2170,15 @@ case "$target" in
CheckAAlib
CheckOpenGL
CheckPTHREAD
SDL_LIBS="$SDL_LIBS -lrt"
# Set up files for the main() stub
COPY_ARCH_SRC(src/main, linux, SDL_main.c)
# Set up files for the audio library
if test x$enable_audio = xyes; then
CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
CFLAGS="$CFLAGS -I/usr/include/mme -DMMEAUDIO_SUPPORT"
SYSTEM_LIBS="$SYSTEM_LIBS -lmme"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS mme"
AUDIO_DRIVERS="$AUDIO_DRIVERS mme/libaudio_mme.la"
fi
# Set up files for the joystick library
# (No joystick support yet)
Expand All @@ -2187,8 +2189,8 @@ case "$target" in
# Set up files for the cdrom library
# (No cdrom support yet)
if test x$enable_cdrom = xyes; then
CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
CDROM_SUBDIRS="$CDROM_SUBDIRS osf"
CDROM_DRIVERS="$CDROM_DRIVERS osf/libcdrom_osf.la"
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
Expand Down Expand Up @@ -2626,6 +2628,7 @@ src/audio/dsp/Makefile
src/audio/esd/Makefile
src/audio/macrom/Makefile
src/audio/mint/Makefile
src/audio/mme/Makefile
src/audio/nas/Makefile
src/audio/nto/Makefile
src/audio/openbsd/Makefile
Expand Down Expand Up @@ -2695,6 +2698,7 @@ src/cdrom/linux/Makefile
src/cdrom/macos/Makefile
src/cdrom/macosx/Makefile
src/cdrom/openbsd/Makefile
src/cdrom/osf/Makefile
src/cdrom/qnx/Makefile
src/cdrom/win32/Makefile
src/thread/Makefile
Expand Down
4 changes: 3 additions & 1 deletion include/SDL_types.h
Expand Up @@ -47,7 +47,7 @@ typedef signed int Sint32;

/* Figure out how to support 64-bit datatypes */
#if !defined(__STRICT_ANSI__)
#if defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_C)
#if defined(__GNUC__) || defined(__MWERKS__) || defined(__DECC)
#define SDL_HAS_64BIT_TYPE long long
#elif defined(_MSC_VER) /* VC++ */
#define SDL_HAS_64BIT_TYPE __int64
Expand All @@ -61,7 +61,9 @@ typedef signed int Sint32;

/* The 64-bit datatype isn't supported on all platforms */
#ifdef SDL_HAS_64BIT_TYPE
#ifndef H_MMBASIC
typedef unsigned SDL_HAS_64BIT_TYPE Uint64;
#endif
typedef SDL_HAS_64BIT_TYPE Sint64;
#else
/* This is really just a hack to prevent the compiler from complaining */
Expand Down
24 changes: 22 additions & 2 deletions src/audio/Makefile.am
Expand Up @@ -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@

Expand Down
3 changes: 3 additions & 0 deletions src/audio/SDL_audio.c
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions src/audio/SDL_sysaudio.h
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions src/audio/mme/.cvsignore
@@ -0,0 +1,6 @@
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
9 changes: 9 additions & 0 deletions src/audio/mme/Makefile.am
@@ -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 changes: 256 additions & 0 deletions src/audio/mme/SDL_mmeaudio.c
@@ -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;
}
}

0 comments on commit eda1583

Please sign in to comment.