[SDL2] Add audio subsystem
This commit is contained in:
Arnav Bhatt
parent
ea06f0d7a6
commit
a6821141d8
@ -18,7 +18,7 @@ atomic_OBJS = src/atomic/SDL_atomic.o src/atomic/SDL_spinlock.o
|
||||
audio_OBJS = src/audio/SDL_audio.o src/audio/SDL_audiocvt.o \
|
||||
src/audio/SDL_audiodev.o src/audio/SDL_audiotypecvt.o \
|
||||
src/audio/SDL_mixer.o src/audio/SDL_wave.o \
|
||||
src/audio/dummy/SDL_dummyaudio.o
|
||||
src/audio/kolibri/SDL_kolibriaudio.o
|
||||
|
||||
cpuinfo_OBJS = zsrc/cpuinfo/SDL_cpuinfo.o
|
||||
|
||||
|
||||
@ -89,8 +89,8 @@
|
||||
#define HAVE_TRUNCF 1
|
||||
#define HAVE_SETJMP 1
|
||||
|
||||
/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
|
||||
#define SDL_AUDIO_DRIVER_DUMMY 1
|
||||
/* Enable the Kolibri audio driver (src/audio/kolibri/\*.c) */
|
||||
#define SDL_AUDIO_DRIVER_KOLIBRI 1
|
||||
|
||||
/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
|
||||
#define SDL_JOYSTICK_DISABLED 1
|
||||
|
||||
@ -132,6 +132,9 @@ static const AudioBootStrap *const bootstrap[] = {
|
||||
#ifdef SDL_AUDIO_DRIVER_DISK
|
||||
&DISKAUDIO_bootstrap,
|
||||
#endif
|
||||
#ifdef SDL_AUDIO_DRIVER_KOLIBRI
|
||||
&KOLIBRIAUDIO_bootstrap,
|
||||
#endif
|
||||
#ifdef SDL_AUDIO_DRIVER_DUMMY
|
||||
&DUMMYAUDIO_bootstrap,
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,187 @@
|
||||
|
||||
#include "../../SDL_internal.h"
|
||||
|
||||
#ifdef SDL_AUDIO_DRIVER_KOLIBRI
|
||||
|
||||
#include <sound.h>
|
||||
#include <sys/ksys.h>
|
||||
|
||||
#include "SDL_audio.h"
|
||||
|
||||
#include "../SDL_audio_c.h"
|
||||
#include "../SDL_audiodev_c.h"
|
||||
|
||||
#include "SDL_kolibriaudio.h"
|
||||
|
||||
/* The tag name used by Kolibri audio */
|
||||
#define AUDIO_THREAD_STACK_SIZE 40960
|
||||
#define KOLIBRIAUDIO_DRIVER_NAME "kolibri"
|
||||
|
||||
/* Variables required for spawning a thread for audio */
|
||||
static ksys_thread_t thread_info;
|
||||
static int main_slot;
|
||||
static uint32_t main_tid;
|
||||
static uint32_t thread_stack[AUDIO_THREAD_STACK_SIZE];
|
||||
static SDL_AudioDevice *global_device;
|
||||
|
||||
static void kolibri_audio_callback(void)
|
||||
{
|
||||
ksys_signal_info_t snd_signal;
|
||||
SDL_AudioDevice *_this;
|
||||
SDL_AudioCallback callback;
|
||||
int bPaused;
|
||||
|
||||
// initialize
|
||||
_this = global_device;
|
||||
|
||||
if (CreateBuffer(private->used_format | PCM_RING, 0, &private->hBuff)) {
|
||||
private->audio_response = 1;
|
||||
exit(0);
|
||||
}
|
||||
private->audio_response = 1;
|
||||
|
||||
// wait for resume
|
||||
while (SDL_AtomicGet(&_this->paused))
|
||||
_ksys_thread_yield();
|
||||
_ksys_debug_puts("audio_thread created\n");
|
||||
|
||||
bPaused = 0;
|
||||
private->audio_response = 1;
|
||||
PlayBuffer(private->hBuff, 0);
|
||||
callback = _this->callbackspec.callback;
|
||||
|
||||
// main loop
|
||||
while (1) {
|
||||
if (!SDL_AtomicGet(&_this->paused)) {
|
||||
PlayBuffer(private->hBuff, 0);
|
||||
bPaused = 0;
|
||||
private->audio_response = 1;
|
||||
} else if (SDL_AtomicGet(&_this->paused)) {
|
||||
StopBuffer(private->hBuff);
|
||||
bPaused = 1;
|
||||
private->audio_response = 1;
|
||||
} else if (SDL_AtomicGet(&_this->shutdown)) {
|
||||
private->audio_response = 1;
|
||||
StopBuffer(private->hBuff);
|
||||
DestroyBuffer(private->hBuff);
|
||||
exit(0);
|
||||
} else {
|
||||
_ksys_thread_info(&thread_info, main_slot);
|
||||
if (thread_info.slot_state == KSYS_SLOT_STATE_FREE || thread_info.pid != main_tid) {
|
||||
SDL_AtomicSet(&_this->shutdown, 1);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (bPaused) {
|
||||
_ksys_delay(5);
|
||||
} else {
|
||||
_ksys_wait_signal(&snd_signal);
|
||||
if (snd_signal.id != 0xFF000001)
|
||||
continue;
|
||||
|
||||
if (!_this->stream) { /* no conversion necessary. */
|
||||
callback(_this->callbackspec.userdata, _this->work_buffer, _this->spec.size);
|
||||
} else { /* streaming/converting */
|
||||
const int stream_len = _this->callbackspec.size;
|
||||
const int ilen = (int)_this->spec.size;
|
||||
|
||||
callback(_this->callbackspec.userdata, _this->work_buffer, stream_len);
|
||||
if (SDL_AudioStreamPut(_this->stream, _this->work_buffer, stream_len) == -1) {
|
||||
SDL_AudioStreamClear(_this->stream);
|
||||
SDL_AtomicSet(&_this->enabled, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
const int got = SDL_AudioStreamGet(_this->stream, _this->work_buffer, ilen);
|
||||
SDL_assert((got < 0) || (got == ilen));
|
||||
if (got != ilen) {
|
||||
SDL_memset(_this->work_buffer, _this->spec.silence, _this->spec.size);
|
||||
}
|
||||
}
|
||||
SetBuffer(private->hBuff, _this->work_buffer, ((int *)snd_signal.data)[2], _this->spec.size);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void KOLIBRIAUDIO_CloseDevice(SDL_AudioDevice *device)
|
||||
{
|
||||
if (device->hidden->audio_tid)
|
||||
return;
|
||||
|
||||
device->hidden->audio_response = 0;
|
||||
while (!device->hidden->audio_response)
|
||||
_ksys_thread_yield();
|
||||
|
||||
SDL_free(device->work_buffer);
|
||||
SDL_free(device->hidden);
|
||||
}
|
||||
|
||||
static int KOLIBRIAUDIO_OpenDevice(_THIS, const char *devname)
|
||||
{
|
||||
int ver;
|
||||
SDL_AudioFormat test_format;
|
||||
|
||||
if (InitSound(&ver)) {
|
||||
SDL_SetError("Error: cannot load drivers!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
private = (SDL_PrivateAudioData *)SDL_calloc(1, sizeof(*private));
|
||||
if (!private) {
|
||||
return SDL_OutOfMemory();
|
||||
}
|
||||
|
||||
private->used_format = PCM_2_16_48;
|
||||
|
||||
_this->spec.freq = 48000;
|
||||
_this->spec.format = AUDIO_S16LSB;
|
||||
_this->spec.channels = 2;
|
||||
SDL_CalculateAudioSpec(&_this->spec);
|
||||
|
||||
_ksys_thread_info(&thread_info, KSYS_THIS_SLOT);
|
||||
main_tid = thread_info.pid;
|
||||
for (main_slot = 0;; main_slot++) {
|
||||
_ksys_thread_info(&thread_info, main_slot);
|
||||
if (thread_info.slot_state != KSYS_SLOT_STATE_FREE && thread_info.pid == main_tid)
|
||||
break;
|
||||
}
|
||||
|
||||
global_device = _this;
|
||||
private->audio_tid = _ksys_create_thread(kolibri_audio_callback, thread_stack + AUDIO_THREAD_STACK_SIZE);
|
||||
if (private->audio_tid < 0) {
|
||||
SDL_SetError("Cannot create audio thread");
|
||||
return -1;
|
||||
}
|
||||
|
||||
_ksys_focus_window(main_slot);
|
||||
while (!private->audio_response)
|
||||
_ksys_thread_yield();
|
||||
|
||||
if (!private->hBuff) {
|
||||
SDL_SetError("Cannot create audio buffer");
|
||||
return -1;
|
||||
}
|
||||
|
||||
char *info;
|
||||
SDL_asprintf(&info, "obtained size is %d, samples %d\n", _this->spec.size, _this->spec.samples);
|
||||
_ksys_debug_puts(info);
|
||||
SDL_free(info);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SDL_bool KOLIBRIAUDIO_Init(SDL_AudioDriverImpl *impl)
|
||||
{
|
||||
impl->CloseDevice = KOLIBRIAUDIO_CloseDevice;
|
||||
impl->OpenDevice = KOLIBRIAUDIO_OpenDevice;
|
||||
impl->OnlyHasDefaultOutputDevice = SDL_TRUE;
|
||||
impl->ProvidesOwnCallbackThread = SDL_TRUE;
|
||||
|
||||
return SDL_TRUE;
|
||||
}
|
||||
|
||||
AudioBootStrap KOLIBRIAUDIO_bootstrap = {
|
||||
KOLIBRIAUDIO_DRIVER_NAME, "Kolibri Audio Driver",
|
||||
KOLIBRIAUDIO_Init, SDL_FALSE
|
||||
};
|
||||
|
||||
#endif /* SDL_AUDIO_DRIVER_KOLIBRI */
|
||||
@ -0,0 +1,16 @@
|
||||
|
||||
#ifndef SDL_kolibriaudio_h_
|
||||
#define SDL_kolibriaudio_h_
|
||||
|
||||
#define _THIS SDL_AudioDevice *_this
|
||||
#define private _this->hidden
|
||||
|
||||
typedef struct SDL_PrivateAudioData
|
||||
{
|
||||
SNDBUF hBuff;
|
||||
int audio_tid;
|
||||
uint32_t used_format;
|
||||
volatile int audio_response;
|
||||
} SDL_PrivateAudioData;
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user