- added SDL sound support (wave output only)
This commit is contained in:
Volker Ruppert
parent
3a4c3e9d54
commit
095fd7d18a
@ -1782,6 +1782,16 @@ if test "$soundcard_present" = 1; then
|
||||
AC_MSG_RESULT(dummy)
|
||||
;;
|
||||
esac
|
||||
AC_MSG_CHECKING(for additional sound lowlevel modules)
|
||||
if test "$with_sdl" = yes; then
|
||||
SOUNDLOW_OBJS="$SOUNDLOW_OBJS soundsdl.o"
|
||||
if test "$bx_plugins" = 1; then
|
||||
SOUND_LINK_OPTS="$SOUND_LINK_OPTS `sdl-config --libs`"
|
||||
fi
|
||||
AC_MSG_RESULT(sdl)
|
||||
else
|
||||
AC_MSG_RESULT(none)
|
||||
fi
|
||||
if test "$bx_plugins" = 0; then
|
||||
SOUND_LIB_VAR='iodev/sound/libsound.a'
|
||||
AC_SUBST(SOUND_LIB_VAR)
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2011 The Bochs Project
|
||||
// Copyright (C) 2011-2012 The Bochs Project
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
@ -35,6 +35,7 @@
|
||||
#include "soundlnx.h"
|
||||
#include "soundwin.h"
|
||||
#include "soundosx.h"
|
||||
#include "soundsdl.h"
|
||||
|
||||
#define LOG_THIS theES1370Device->
|
||||
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
#include "soundlnx.h"
|
||||
#include "soundwin.h"
|
||||
#include "soundosx.h"
|
||||
#include "soundsdl.h"
|
||||
|
||||
#define LOG_THIS theSB16Device->
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2011 The Bochs Project
|
||||
// Copyright (C) 2011-2012 The Bochs Project
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
@ -33,7 +33,7 @@
|
||||
#include "soundlnx.h"
|
||||
#include "soundosx.h"
|
||||
#include "soundwin.h"
|
||||
//#include "soundsdl.h"
|
||||
#include "soundsdl.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#include <pthread.h>
|
||||
@ -72,7 +72,7 @@ void* bx_soundmod_ctl_c::init_module(const char *type, logfunctions *device)
|
||||
{
|
||||
if (!strcmp(type, "default")) {
|
||||
soundmod = new BX_SOUND_LOWLEVEL_C(device);
|
||||
#if 0
|
||||
#if BX_WITH_SDL
|
||||
} else if (!strcmp(type, "sdl")) {
|
||||
soundmod = new bx_sound_sdl_c(device);
|
||||
#endif
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2011 The Bochs Project
|
||||
// Copyright (C) 2011-2012 The Bochs Project
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
|
||||
177
bochs/iodev/sound/soundsdl.cc
Normal file
177
bochs/iodev/sound/soundsdl.cc
Normal file
@ -0,0 +1,177 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2012 The Bochs Project
|
||||
//
|
||||
// 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 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
|
||||
|
||||
// Lowlevel sound output support for SDL written by Volker Ruppert
|
||||
|
||||
#include "iodev.h"
|
||||
#include "soundmod.h"
|
||||
#include "soundsdl.h"
|
||||
|
||||
#if BX_WITH_SDL && BX_SUPPORT_SOUNDLOW
|
||||
|
||||
#define LOG_THIS device->
|
||||
|
||||
#if BX_WITH_SDL
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
|
||||
#define BX_SOUND_SDL_BUFSIZE BX_SOUNDLOW_WAVEPACKETSIZE * 8
|
||||
|
||||
static struct {
|
||||
int iptr;
|
||||
int optr;
|
||||
Bit8u data[BX_SOUND_SDL_BUFSIZE];
|
||||
} audio_buffer;
|
||||
|
||||
|
||||
bx_sound_sdl_c::bx_sound_sdl_c(logfunctions *dev)
|
||||
:bx_sound_lowlevel_c(dev)
|
||||
{
|
||||
WaveOpen = 0;
|
||||
if (SDL_InitSubSystem(SDL_INIT_AUDIO)) {
|
||||
BX_PANIC(("Initialization of sound output module 'sdl' failed"));
|
||||
} else {
|
||||
BX_INFO(("Sound output module 'sdl' initialized"));
|
||||
}
|
||||
}
|
||||
|
||||
bx_sound_sdl_c::~bx_sound_sdl_c()
|
||||
{
|
||||
SDL_QuitSubSystem(SDL_INIT_AUDIO);
|
||||
}
|
||||
|
||||
|
||||
int bx_sound_sdl_c::openwaveoutput(const char *wavedev)
|
||||
{
|
||||
WaveOpen = 1;
|
||||
return BX_SOUNDLOW_OK;
|
||||
}
|
||||
|
||||
void sdl_callback(void *unused, Bit8u *stream, int len)
|
||||
{
|
||||
int amount = audio_buffer.iptr - audio_buffer.optr;
|
||||
if (amount < 0) {
|
||||
amount += BX_SOUND_SDL_BUFSIZE;
|
||||
}
|
||||
if (amount > len) {
|
||||
amount = len;
|
||||
}
|
||||
int tmplen = BX_SOUND_SDL_BUFSIZE - audio_buffer.optr;
|
||||
if (amount <= tmplen) {
|
||||
SDL_MixAudio(stream, &audio_buffer.data[audio_buffer.optr], amount, SDL_MIX_MAXVOLUME);
|
||||
audio_buffer.optr += amount;
|
||||
} else {
|
||||
SDL_MixAudio(stream, &audio_buffer.data[audio_buffer.optr], tmplen, SDL_MIX_MAXVOLUME);
|
||||
amount -= tmplen;
|
||||
SDL_MixAudio(stream, &audio_buffer.data[0], amount, SDL_MIX_MAXVOLUME);
|
||||
audio_buffer.optr = amount;
|
||||
}
|
||||
}
|
||||
|
||||
int bx_sound_sdl_c::startwaveplayback(int frequency, int bits, bx_bool stereo, int format)
|
||||
{
|
||||
SDL_AudioSpec fmt;
|
||||
int signeddata = format & 1;
|
||||
|
||||
BX_DEBUG(("startwaveplayback(%d, %d, %d, %x)", frequency, bits, stereo, format));
|
||||
fmt.freq = frequency;
|
||||
|
||||
if (bits == 16) {
|
||||
if (signeddata == 1)
|
||||
fmt.format = AUDIO_S16;
|
||||
else
|
||||
fmt.format = AUDIO_U16;
|
||||
} else if (bits == 8) {
|
||||
if (signeddata == 1)
|
||||
fmt.format = AUDIO_S8;
|
||||
else
|
||||
fmt.format = AUDIO_U8;
|
||||
} else
|
||||
return BX_SOUNDLOW_ERR;
|
||||
|
||||
fmt.channels = stereo + 1;
|
||||
fmt.samples = frequency / 10;
|
||||
fmt.callback = sdl_callback;
|
||||
fmt.userdata = NULL;
|
||||
if (SDL_OpenAudio(&fmt, NULL) < 0) {
|
||||
BX_PANIC(("SDL_OpenAudio() failed"));
|
||||
return BX_SOUNDLOW_ERR;
|
||||
}
|
||||
audio_buffer.iptr = 0;
|
||||
audio_buffer.optr = 0;
|
||||
return BX_SOUNDLOW_OK;
|
||||
}
|
||||
|
||||
int bx_sound_sdl_c::waveready()
|
||||
{
|
||||
int size;
|
||||
|
||||
if (WaveOpen) {
|
||||
size = audio_buffer.optr - audio_buffer.iptr;
|
||||
if (size <= 0) {
|
||||
size += BX_SOUND_SDL_BUFSIZE;
|
||||
}
|
||||
if (size < BX_SOUNDLOW_WAVEPACKETSIZE) {
|
||||
return BX_SOUNDLOW_ERR;
|
||||
} else {
|
||||
return BX_SOUNDLOW_OK;
|
||||
}
|
||||
} else {
|
||||
return BX_SOUNDLOW_ERR;
|
||||
}
|
||||
}
|
||||
|
||||
int bx_sound_sdl_c::sendwavepacket(int length, Bit8u data[])
|
||||
{
|
||||
int ret = BX_SOUNDLOW_OK;
|
||||
int tmpsize;
|
||||
|
||||
SDL_PauseAudio(1);
|
||||
if (waveready() == BX_SOUNDLOW_OK) {
|
||||
if ((audio_buffer.iptr + length) > BX_SOUND_SDL_BUFSIZE) {
|
||||
tmpsize = BX_SOUND_SDL_BUFSIZE - audio_buffer.iptr;
|
||||
memcpy(audio_buffer.data+audio_buffer.iptr, data, tmpsize);
|
||||
memcpy(audio_buffer.data, data+tmpsize, length-tmpsize);
|
||||
audio_buffer.iptr = length-tmpsize;
|
||||
} else {
|
||||
memcpy(audio_buffer.data+audio_buffer.iptr, data, length);
|
||||
audio_buffer.iptr += length;
|
||||
}
|
||||
} else {
|
||||
BX_ERROR(("SDL: audio buffer overflow"));
|
||||
ret = BX_SOUNDLOW_ERR;
|
||||
}
|
||||
SDL_PauseAudio(0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int bx_sound_sdl_c::stopwaveplayback()
|
||||
{
|
||||
SDL_CloseAudio();
|
||||
return BX_SOUNDLOW_OK;
|
||||
}
|
||||
|
||||
int bx_sound_sdl_c::closewaveoutput()
|
||||
{
|
||||
WaveOpen = 0;
|
||||
return BX_SOUNDLOW_OK;
|
||||
}
|
||||
|
||||
#endif // BX_WITH_SDL
|
||||
46
bochs/iodev/sound/soundsdl.h
Normal file
46
bochs/iodev/sound/soundsdl.h
Normal file
@ -0,0 +1,46 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2012 The Bochs Project
|
||||
//
|
||||
// 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 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
|
||||
|
||||
// Lowlevel sound output support for SDL written by Volker Ruppert
|
||||
|
||||
|
||||
#if BX_WITH_SDL
|
||||
|
||||
#include "bochs.h"
|
||||
|
||||
class bx_sound_sdl_c : public bx_sound_lowlevel_c {
|
||||
public:
|
||||
bx_sound_sdl_c(logfunctions *dev);
|
||||
virtual ~bx_sound_sdl_c();
|
||||
|
||||
virtual int get_type() {return BX_SOUNDLOW_SDL;}
|
||||
|
||||
virtual int waveready();
|
||||
|
||||
virtual int openwaveoutput(const char *wavedev);
|
||||
virtual int startwaveplayback(int frequency, int bits, bx_bool stereo, int format);
|
||||
virtual int sendwavepacket(int length, Bit8u data[]);
|
||||
virtual int stopwaveplayback();
|
||||
virtual int closewaveoutput();
|
||||
private:
|
||||
bx_bool WaveOpen;
|
||||
};
|
||||
|
||||
#endif // BX_WITH_SDL
|
||||
Loading…
x
Reference in New Issue
Block a user