Mercurial > sdl-ios-xcode

changeset 4718:79aa6c61f33b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added stub android sound system
author Paul Hunkin <paul@bieh.net>
date Tue, 27 Jul 2010 11:34:43 +0200
parents 191f4693d0c1
children d59792d2c3ae
files Makefile.android src/audio/SDL_audio.c src/audio/android/SDL_androidaudio.c src/audio/android/SDL_androidaudio.h src/audio/android/SDL_androidaudio.o
diffstat 5 files changed, 153 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.android	Tue Jul 27 11:02:07 2010 +0200
+++ b/Makefile.android	Tue Jul 27 11:34:43 2010 +0200
@@ -28,7 +28,7 @@
 	src/timer/*.c \
 	src/video/*.c \
 	src/power/*.c \
-	src/audio/dummy/*.c \
+	src/audio/android/*.c \
 	src/video/android/*.c \
 	src/joystick/dummy/*.c \
 	src/haptic/dummy/*.c \
--- a/src/audio/SDL_audio.c	Tue Jul 27 11:02:07 2010 +0200
+++ b/src/audio/SDL_audio.c	Tue Jul 27 11:34:43 2010 +0200
@@ -69,6 +69,7 @@
 extern AudioBootStrap DART_bootstrap;
 extern AudioBootStrap NDSAUD_bootstrap;
 extern AudioBootStrap FUSIONSOUND_bootstrap;
+extern AudioBootStrap ANDROIDAUD_bootstrap;
 
 
 /* Available audio drivers */
@@ -137,6 +138,9 @@
 #if SDL_AUDIO_DRIVER_FUSIONSOUND
     &FUSIONSOUND_bootstrap,
 #endif
+#if SDL_AUDIO_DRIVER_ANDROID
+    &ANDROIDAUD_bootstrap,
+#endif
     NULL
 };
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audio/android/SDL_androidaudio.c	Tue Jul 27 11:34:43 2010 +0200
@@ -0,0 +1,106 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2010 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    This file written by Ryan C. Gordon (icculus@icculus.org)
+*/
+#include "SDL_config.h"
+
+/* Output audio to Android */
+
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "SDL_androidaudio.h"
+
+#include <android/log.h>
+
+static int
+AndroidAUD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    //TODO: Sample rates etc
+    __android_log_print(ANDROID_LOG_INFO, "SDL", "AndroidAudio Open\n");
+    
+    return 1;
+}
+
+static void
+AndroidAUD_PlayDevice(_THIS)
+{
+    __android_log_print(ANDROID_LOG_INFO, "SDL", "AndroidAudio Play\n");
+    
+    
+
+    //playGenericSound(this->hidden->mixbuf, this->hidden->mixlen);
+    
+#if 0
+//    sound->data = this->hidden->mixbuf;/* pointer to raw audio data */
+//    sound->len = this->hidden->mixlen; /* size of raw data pointed to above */
+//    sound->rate = 22050; /* sample rate = 22050Hz */
+//    sound->vol = 127;    /* volume [0..127] for [min..max] */
+//    sound->pan = 64;     /* balance [0..127] for [left..right] */
+//    sound->format = 0;   /* 0 for 16-bit, 1 for 8-bit */
+//    playSound(sound);
+#endif
+}
+
+
+static Uint8 *
+AndroidAUD_GetDeviceBuf(_THIS)
+{
+    return this->hidden->mixbuf;        /* is this right? */
+}
+
+static void
+AndroidAUD_WaitDevice(_THIS)
+{
+    /* stub */
+}
+
+static void
+AndroidAUD_CloseDevice(_THIS)
+{
+    /* stub */
+}
+
+static int
+AndroidAUD_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->OpenDevice = AndroidAUD_OpenDevice;
+    impl->PlayDevice = AndroidAUD_PlayDevice;
+    impl->WaitDevice = AndroidAUD_WaitDevice;
+    impl->GetDeviceBuf = AndroidAUD_GetDeviceBuf;
+    impl->CloseDevice = AndroidAUD_CloseDevice;
+
+    /* and the capabilities */
+    impl->HasCaptureSupport = 0; //TODO
+    impl->OnlyHasDefaultOutputDevice = 1;
+    impl->OnlyHasDefaultInputDevice = 1;
+
+    __android_log_print(ANDROID_LOG_INFO, "SDL","Audio init\n");
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap ANDROIDAUD_bootstrap = {
+    "android", "SDL Android audio driver", AndroidAUD_Init, 0       /*1? */
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audio/android/SDL_androidaudio.h	Tue Jul 27 11:34:43 2010 +0200
@@ -0,0 +1,42 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2010 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_androidaudio_h
+#define _SDL_androidaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS	SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    Uint8 *mixbuf;
+    Uint32 mixlen;
+    Uint32 write_delay;
+    Uint32 initial_calls;
+};
+
+#endif /* _SDL_androidaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
Binary file src/audio/android/SDL_androidaudio.o has changed