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

Some speaker output fixes.

Browse Source 
- Increase buffer size and allocate buffer dynamicly.
- Make sure the beep_level is correctly set up in dsp_generator().
- TODO: fix timer code for usable sound output with the speaker.
This commit is contained in:
Volker Ruppert 2024-01-01 19:43:33 +01:00
parent 7985fa1ebb
commit f48acd833f
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bochs/iodev/speaker.cc
View File

@ -3,7 +3,7 @@
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 David N. Welton <davidw@dedasys.com>.
// Copyright (C) 2003-2021 The Bochs Project
// Copyright (C) 2003-2024 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
@ -164,6 +164,7 @@ bx_speaker_c::bx_speaker_c()
#endif
#if BX_SUPPORT_SOUNDLOW
waveout = NULL;
dsp_event_buffer = NULL;
#endif
}
@ -178,6 +179,9 @@ bx_speaker_c::~bx_speaker_c()
if (beep_callback_id >= 0) {
waveout->unregister_wave_callback(beep_callback_id);
}
#if BX_HAVE_REALTIME_USEC
delete [] dsp_event_buffer;
#endif
}
break;
#endif
@ -211,11 +215,13 @@ void bx_speaker_c::init(void)
if (waveout != NULL) {
beep_active = 0;
beep_volume = SIM->get_param_num("volume", base)->get();
beep_level = 0;
#if BX_HAVE_REALTIME_USEC
dsp_active = 0;
dsp_start_usec = bx_get_realtime64_usec();
dsp_cb_usec = 0;
dsp_count = 0;
dsp_event_buffer = new Bit64u[DSP_EVENT_BUFSIZE];
#endif
BX_INIT_MUTEX(beep_mutex);
beep_callback_id = waveout->register_wave_callback(theSpeaker, beep_callback);
@ -297,6 +303,9 @@ Bit32u bx_speaker_c::dsp_generator(Bit16u rate, Bit8u *buffer, Bit32u len)
Bit32u i = 0, j = 0;
double tmp_dsp_usec, step_usec;
if (beep_level == 0) {
beep_level = (Bit16s)(0x4000 * (beep_volume / 15.0f));
}
Bit64u new_dsp_cb_usec = bx_get_realtime64_usec() - dsp_start_usec;
if (dsp_cb_usec == 0) {
dsp_cb_usec = new_dsp_cb_usec - 25000;
@ -434,7 +443,7 @@ void bx_speaker_c::set_line(bool level)
BX_LOCK(beep_mutex);
Bit64u timestamp = bx_get_realtime64_usec() - dsp_start_usec;
dsp_active = 1;
if (dsp_count < 500) {
if (dsp_count < DSP_EVENT_BUFSIZE) {
dsp_event_buffer[dsp_count++] = timestamp;
} else {
BX_ERROR(("DSP event buffer full"));

8
bochs/iodev/speaker.h
View File

@ -3,7 +3,7 @@
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 David N. Welton <davidw@dedasys.com>.
// Copyright (C) 2003-2021 The Bochs Project
// Copyright (C) 2003-2024 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
@ -29,6 +29,10 @@
#ifndef BX_PC_SPEAKER_H
#define BX_PC_SPEAKER_H
#if BX_SUPPORT_SOUNDLOW
#define DSP_EVENT_BUFSIZE 4800
#endif
class bx_soundlow_waveout_c;
class bx_speaker_c : public bx_speaker_stub_c {
@ -69,7 +73,7 @@ private:
Bit64u dsp_start_usec;
Bit64u dsp_cb_usec;
Bit32u dsp_count;
Bit64u dsp_event_buffer[500];
Bit64u *dsp_event_buffer;
#endif
#endif
};