Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40655

configure.in

@@ -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)
@@ -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
@@ -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
@@ -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

include/SDL_types.h

@@ -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
@@ -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 */

src/audio/Makefile.am

@@ -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@
 

src/audio/SDL_audio.c

@@ -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,

src/audio/SDL_sysaudio.h

@@ -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;

src/audio/mme/.cvsignore

+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

src/audio/mme/Makefile.am

+
+## 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

src/audio/mme/SDL_mmeaudio.c

+/*
+    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;
+    }
+}
+

src/audio/mme/SDL_mmeaudio.h

+/*
+    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 */

src/audio/riscos/.cvsignore

+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

src/cdrom/Makefile.am

@@ -5,18 +5,19 @@ noinst_LTLIBRARIES = libcdrom.la
 
 # Define which subdirectories need to be built
 SUBDIRS = @CDROM_SUBDIRS@
-DIST_SUBDIRS = \
-	aix \
-	beos \
-	bsdi \
-	dc \
-	dummy \
-	freebsd \
-	linux \
-	macos \
-	macosx \
-	openbsd \
-	qnx \
+DIST_SUBDIRS =	\
+	aix	\
+	beos	\
+	bsdi	\
+	dc	\
+	dummy	\
+	freebsd	\
+	linux	\
+	macos	\
+	macosx	\
+	openbsd	\
+	osf	\
+	qnx	\
 	win32
 
 DRIVERS = @CDROM_DRIVERS@

src/cdrom/osf/.cvsignore

+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

src/cdrom/osf/Makefile.am

+
+## Makefile.am for the osf cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_osf.la
+libcdrom_osf_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c