claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5419 from Cacodemon345/cms-saasound

Browse Source 
Port Sound Blaster 1.x/2.x SAA1099 emulation to SAASound
This commit is contained in:
Miran Grča
2025-04-01 19:12:43 +02:00
committed by GitHub
parent c7b2a3c8e5 b644016d1e
commit 00166d15e5
1 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/sound/snd_sb.c
View File

@@ -41,6 +41,7 @@
#include <86box/sound.h> #include <86box/sound.h>
#include "cpu.h" #include "cpu.h"
#include <86box/timer.h> #include <86box/timer.h>
#include "saasound/SAASound.h"
#include <86box/snd_sb.h> #include <86box/snd_sb.h>
#include <86box/plat_unused.h> #include <86box/plat_unused.h>
@@ -145,6 +146,42 @@ sb_log(const char *fmt, ...)
# define sb_log(fmt, ...) # define sb_log(fmt, ...)
#endif #endif
void
sb_cms_get_buffer(int32_t *buffer, int len, void *priv)
{
sb_t *sb = (sb_t *) priv;
cms_update(&sb->cms);
for (int c = 0; c < len * 2; c++) {
if (sb->mixer_enabled) {
buffer[c] += sb->cms.buffer[c] * sb->mixer_sb2.fm;
}
else
buffer[c] += sb->cms.buffer[c];
}
sb->cms.pos = 0;
}
void
sb_cms_get_buffer_2(int32_t *buffer, int len, void *priv)
{
sb_t *sb = (sb_t *) priv;
cms_update(&sb->cms);
for (int c = 0; c < len * 2; c++) {
if (sb->mixer_enabled) {
buffer[c] += sb->cms.buffer2[c] * sb->mixer_sb2.fm;
}
else
buffer[c] += sb->cms.buffer2[c];
}
sb->cms.pos2 = 0;
}
/* SB 1, 1.5, MCV, and 2 do not have a mixer, so signal is hardwired. */ /* SB 1, 1.5, MCV, and 2 do not have a mixer, so signal is hardwired. */
static void static void
sb_get_buffer_sb2(int32_t *buffer, int len, void *priv) sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
@@ -155,23 +192,10 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
sb_dsp_update(&sb->dsp); sb_dsp_update(&sb->dsp);
if (sb->cms_enabled)
cms_update(&sb->cms);
for (int c = 0; c < len * 2; c += 2) { for (int c = 0; c < len * 2; c += 2) {
double out_l = 0.0; double out_l = 0.0;
double out_r = 0.0; double out_r = 0.0;
if (sb->cms_enabled) {
out_l += sb->cms.buffer[c];
out_r += sb->cms.buffer[c + 1];
}
if (sb->cms_enabled && sb->mixer_enabled) {
out_l *= mixer->fm;
out_r *= mixer->fm;
}
/* TODO: Recording: I assume it has direct mic and line in like SB2. /* TODO: Recording: I assume it has direct mic and line in like SB2.
It is unclear from the docs if it has a filter, but it probably does. */ It is unclear from the docs if it has a filter, but it probably does. */
/* TODO: Recording: Mic and line In with AGC. */ /* TODO: Recording: Mic and line In with AGC. */
@@ -192,9 +216,6 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
} }
sb->dsp.pos = 0; sb->dsp.pos = 0;
if (sb->cms_enabled)
sb->cms.pos = 0;
} }
static void static void
@@ -2890,6 +2911,13 @@ sb_init(UNUSED(const device_t *info))
cms_read, NULL, NULL, cms_read, NULL, NULL,
cms_write, NULL, NULL, cms_write, NULL, NULL,
&sb->cms); &sb->cms);
sb->cms.saasound = newSAASND();
SAASNDSetSoundParameters(sb->cms.saasound, SAAP_44100 | SAAP_16BIT | SAAP_NOFILTER | SAAP_STEREO);
sb->cms.saasound2 = newSAASND();
SAASNDSetSoundParameters(sb->cms.saasound2, SAAP_44100 | SAAP_16BIT | SAAP_NOFILTER | SAAP_STEREO);
wavetable_add_handler(sb_cms_get_buffer, sb);
wavetable_add_handler(sb_cms_get_buffer_2, sb);
} }
if (mixer_addr > 0x000) { if (mixer_addr > 0x000) {
@@ -4044,6 +4072,11 @@ sb_close(void *priv)
sb_t *sb = (sb_t *) priv; sb_t *sb = (sb_t *) priv;
sb_dsp_close(&sb->dsp); sb_dsp_close(&sb->dsp);
if (sb->cms_enabled) {
deleteSAASND(sb->cms.saasound);
deleteSAASND(sb->cms.saasound2);
}
free(sb); free(sb);
} }