More work on the accelerated 2D video driver, beginnings of sprite-ba…

…sed rendering support. Also some initial work on an audio driver.
libsdl-org · Jul 19, 2008 · f6eb8aa · f6eb8aa
1 parent 9b99592
commit f6eb8aa
Show file tree

Hide file tree

Showing 7 changed files with 256 additions and 35 deletions.
diff --git a/Makefile.ds b/Makefile.ds
@@ -31,6 +31,7 @@ src/SDL_error.c \
 src/SDL_fatal.c \
 src/audio/disk/SDL_diskaudio.c \
 src/audio/dummy/SDL_dummyaudio.c \
+src/audio/nds/SDL_ndsaudio.c \
 src/audio/SDL_audio.c \
 src/audio/SDL_audiocvt.c \
 src/audio/SDL_audiodev.c \

diff --git a/include/SDL_config_nintendods.h b/include/SDL_config_nintendods.h
@@ -92,14 +92,15 @@ typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
 #define LACKS_SYS_MMAN_H 1
 
 /* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DUMMY	1
+#define SDL_AUDIO_DRIVER_NDS	1
+/*#define SDL_AUDIO_DRIVER_DUMMY	1 TODO: uncomment this later*/
 
 /* DS doesn't have optical media */
 #define SDL_CDROM_DISABLED	1
 
 /* Enable various input drivers */
 #define SDL_JOYSTICK_NDS	1
-/*#define SDL_JOYSTICK_DUMMY	1*/
+/*#define SDL_JOYSTICK_DUMMY	1 TODO: uncomment this later*/
 
 /* DS has no dynamic linking afaik */
 #define SDL_LOADSO_DISABLED	1
@@ -113,6 +114,6 @@ typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
 
 /* Enable various video drivers */
 #define SDL_VIDEO_DRIVER_NDS	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
+/*#define SDL_VIDEO_DRIVER_DUMMY	1 TODO: uncomment this later*/
 
 #endif /* _SDL_config_nintendods_h */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
@@ -70,6 +70,7 @@ extern AudioBootStrap DUMMYAUD_bootstrap;
 extern AudioBootStrap DCAUD_bootstrap;
 extern AudioBootStrap MMEAUDIO_bootstrap;
 extern AudioBootStrap DART_bootstrap;
+extern AudioBootStrap NDSAUD_bootstrap;
 
 
 /* Available audio drivers */
@@ -144,6 +145,9 @@ static AudioBootStrap *bootstrap[] = {
 #endif
 #if SDL_AUDIO_DRIVER_DART
     &DART_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_NDS
+    &NDSAUD_bootstrap,
 #endif
     NULL
 };

diff --git a/src/audio/nds/SDL_ndsaudio.c b/src/audio/nds/SDL_ndsaudio.c
@@ -0,0 +1,92 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 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 NDS */
+
+#include <nds.h>
+
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "SDL_ndsaudio.h"
+
+static int
+NDSAUD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    return 1;                   /* always succeeds. */
+}
+
+static void
+NDSAUD_PlayDevice(_THIS)
+{
+    TransferSoundData* sound = SDL_malloc(sizeof(TransferSoundData));
+    if(!sound) {
+        SDL_OutOfMemory();
+    }
+    sound->data = NULL;  /* pointer to raw audio data */
+    sound->len = 0;      /* 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 */
+    /* stub */
+}
+
+
+static Uint8 *
+NDSAUD_GetDeviceBuf(_THIS)
+{
+    /* stub */
+}
+
+static void
+NDSAUD_WaitDevice(_THIS)
+{
+    /* stub */
+}
+
+static void
+NDSAUD_CloseDevice(_THIS)
+{
+    /* stub */
+}
+
+static int
+NDSAUD_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->OpenDevice = NDSAUD_OpenDevice;
+    impl->PlayDevice = NDSAUD_PlayDevice;
+    impl->WaitDevice = NDSAUD_WaitDevice;
+    impl->GetDeviceBuf = NDSAUD_GetDeviceBuf;
+    impl->CloseDevice = NDSAUD_CloseDevice;
+    impl->OnlyHasDefaultOutputDevice = 1;
+    return 1;
+}
+
+AudioBootStrap NDSAUD_bootstrap = {
+    "nds", "SDL NDS audio driver", NDSAUD_Init, 1
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/nds/SDL_ndsaudio.h b/src/audio/nds/SDL_ndsaudio.h
@@ -0,0 +1,42 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 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_ndsaudio_h
+#define _SDL_ndsaudio_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_ndsaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */