mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Created a new class for the audio buffer handling to make multiple buffers

Browse Source 
chains possible.
TODO: the lowlevel sound code should bbe rewritten with an additional
conversion thread.
This commit is contained in:
Volker Ruppert 2015-05-15 20:18:47 +00:00
parent 1268d8c14a
commit 377d920956
3 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bochs/iodev/sound/soundlow.cc
View File

@ -33,9 +33,21 @@
// audio buffer support // audio buffer support
static audio_buffer_t *audio_buffers = NULL; bx_audio_buffer_c *audio_buffers;
audio_buffer_t* new_audio_buffer(Bit32u size) bx_audio_buffer_c::bx_audio_buffer_c()
{
root = NULL;
}
bx_audio_buffer_c::~bx_audio_buffer_c()
{
while (root != NULL) {
delete_buffer();
}
}
audio_buffer_t* bx_audio_buffer_c::new_buffer(Bit32u size)
{ {
audio_buffer_t *newbuffer = new audio_buffer_t; audio_buffer_t *newbuffer = new audio_buffer_t;
newbuffer->data = new Bit8u[size]; newbuffer->data = new Bit8u[size];
@ -43,10 +55,10 @@ audio_buffer_t* new_audio_buffer(Bit32u size)
newbuffer->pos = 0; newbuffer->pos = 0;
newbuffer->next = NULL; newbuffer->next = NULL;
if (audio_buffers == NULL) { if (root == NULL) {
audio_buffers = newbuffer; root = newbuffer;
} else { } else {
audio_buffer_t *temp = audio_buffers; audio_buffer_t *temp = root;
while (temp->next) while (temp->next)
temp = temp->next; temp = temp->next;
@ -56,15 +68,15 @@ audio_buffer_t* new_audio_buffer(Bit32u size)
return newbuffer; return newbuffer;
} }
audio_buffer_t* get_current_buffer() audio_buffer_t* bx_audio_buffer_c::get_buffer()
{ {
return audio_buffers; return root;
} }
void delete_audio_buffer() void bx_audio_buffer_c::delete_buffer()
{ {
audio_buffer_t *tmpbuffer = audio_buffers; audio_buffer_t *tmpbuffer = root;
audio_buffers = tmpbuffer->next; root = tmpbuffer->next;
delete [] tmpbuffer->data; delete [] tmpbuffer->data;
delete tmpbuffer; delete tmpbuffer;
} }
@ -78,7 +90,7 @@ Bit32u pcm_callback(void *dev, Bit16u rate, Bit8u *buffer, Bit32u len)
UNUSED(rate); UNUSED(rate);
while (len > 0) { while (len > 0) {
audio_buffer_t *curbuffer = get_current_buffer(); audio_buffer_t *curbuffer = audio_buffers->get_buffer();
if (curbuffer == NULL) if (curbuffer == NULL)
break; break;
Bit32u tmplen = curbuffer->size - curbuffer->pos; Bit32u tmplen = curbuffer->size - curbuffer->pos;
@ -92,7 +104,7 @@ Bit32u pcm_callback(void *dev, Bit16u rate, Bit8u *buffer, Bit32u len)
len -= tmplen; len -= tmplen;
} }
if (curbuffer->pos >= curbuffer->size) { if (curbuffer->pos >= curbuffer->size) {
delete_audio_buffer(); audio_buffers->delete_buffer();
} }
} }
return copied; return copied;
@ -130,6 +142,7 @@ BX_THREAD_FUNC(mixer_thread, indata)
bx_soundlow_waveout_c::bx_soundlow_waveout_c() bx_soundlow_waveout_c::bx_soundlow_waveout_c()
{ {
put("waveout", "WAVOUT"); put("waveout", "WAVOUT");
audio_buffers = new bx_audio_buffer_c();
real_pcm_param = default_pcm_param; real_pcm_param = default_pcm_param;
emu_pcm_param = default_pcm_param; emu_pcm_param = default_pcm_param;
cb_count = 0; cb_count = 0;
@ -178,7 +191,7 @@ int bx_soundlow_waveout_c::sendwavepacket(int length, Bit8u data[], bx_pcm_param
len2 = length * cvt_mult; len2 = length * cvt_mult;
if (pcm_callback_id >= 0) { if (pcm_callback_id >= 0) {
BX_LOCK(mixer_mutex); BX_LOCK(mixer_mutex);
audio_buffer_t *newbuffer = new_audio_buffer(len2); audio_buffer_t *newbuffer = audio_buffers->new_buffer(len2);
convert_pcm_data(data, length, newbuffer->data, len2, src_param); convert_pcm_data(data, length, newbuffer->data, len2, src_param);
BX_UNLOCK(mixer_mutex); BX_UNLOCK(mixer_mutex);
} else { } else {

15
bochs/iodev/sound/soundlow.h
View File

@ -56,10 +56,19 @@ typedef struct _audio_buffer_t
struct _audio_buffer_t *next; struct _audio_buffer_t *next;
} audio_buffer_t; } audio_buffer_t;
audio_buffer_t* new_audio_buffer(Bit32u size); class bx_audio_buffer_c {
audio_buffer_t* get_current_buffer(); public:
void delete_audio_buffer(); bx_audio_buffer_c(void);
~bx_audio_buffer_c();
audio_buffer_t *new_buffer(Bit32u size);
audio_buffer_t *get_buffer();
void delete_buffer();
private:
audio_buffer_t *root;
};
extern bx_audio_buffer_c *audio_buffers;
Bit32u pcm_callback(void *dev, Bit16u rate, Bit8u *buffer, Bit32u len); Bit32u pcm_callback(void *dev, Bit16u rate, Bit8u *buffer, Bit32u len);
extern int mixer_control; extern int mixer_control;

2
bochs/iodev/sound/soundsdl.cc
View File

@ -128,7 +128,7 @@ int bx_soundlow_waveout_sdl_c::sendwavepacket(int length, Bit8u data[], bx_pcm_p
len2 = length * cvt_mult; len2 = length * cvt_mult;
SDL_LockAudio(); SDL_LockAudio();
if (WaveOpen) { if (WaveOpen) {
audio_buffer_t *newbuffer = new_audio_buffer(len2); audio_buffer_t *newbuffer = audio_buffers->new_buffer(len2);
convert_pcm_data(data, length, newbuffer->data, len2, src_param); convert_pcm_data(data, length, newbuffer->data, len2, src_param);
} else { } else {
BX_ERROR(("SDL: audio not open")); BX_ERROR(("SDL: audio not open"));