diff --git a/src/include/86box/snd_ad1848.h b/src/include/86box/snd_ad1848.h index 3105d75f9..6e8282485 100644 --- a/src/include/86box/snd_ad1848.h +++ b/src/include/86box/snd_ad1848.h @@ -70,7 +70,6 @@ typedef struct ad1848_t { uint64_t timer_latch; pc_timer_t cs4231a_irq_timer; - uint8_t is_opl3sa; int16_t buffer[SOUNDBUFLEN * 2]; int pos; @@ -91,7 +90,6 @@ extern void ad1848_update(ad1848_t *ad1848); extern void ad1848_speed_changed(ad1848_t *ad1848); extern void ad1848_filter_cd_audio(int channel, double *buffer, void *priv); extern void ad1848_filter_aux2(void* priv, double* out_l, double* out_r); -extern void ad1848_is_opl3sa(ad1848_t *ad1848); extern void ad1848_init(ad1848_t *ad1848, uint8_t type); diff --git a/src/sound/snd_ad1848.c b/src/sound/snd_ad1848.c index bad9f4d22..cd988a9ef 100644 --- a/src/sound/snd_ad1848.c +++ b/src/sound/snd_ad1848.c @@ -76,12 +76,6 @@ ad1848_setdma(ad1848_t *ad1848, int newdma) ad1848->dma = newdma; } -void -ad1848_is_opl3sa(ad1848_t *ad1848) -{ - ad1848->is_opl3sa = 1; -} - void ad1848_updatevolmask(ad1848_t *ad1848) { @@ -524,8 +518,6 @@ readonly_x: ad1848_updatefreq(ad1848); temp = (ad1848->type < AD1848_TYPE_CS4231) ? 2 : ((ad1848->type == AD1848_TYPE_CS4231) ? 18 : 4); - if (ad1848->is_opl3sa) - temp = 2; /* OPL3-SA CODEC is CS4231-based but uses Aux1 for CD audio */ if (ad1848->regs[temp] & 0x80) ad1848->cd_vol_l = 0; else diff --git a/src/sound/snd_ymf701.c b/src/sound/snd_ymf701.c index 1e45c786a..b18c48953 100644 --- a/src/sound/snd_ymf701.c +++ b/src/sound/snd_ymf701.c @@ -447,7 +447,6 @@ ymf701_init(const device_t *info) sound_add_handler(ymf701_get_buffer, ymf701); music_add_handler(sb_get_music_buffer_sbpro, ymf701->sb); - ad1848_is_opl3sa(&ymf701->ad1848); //sound_set_cd_audio_filter(sbpro_filter_cd_audio, ymf701->sb); /* CD audio filter for the default context */ sound_set_cd_audio_filter(ad1848_filter_cd_audio, &ymf701->ad1848);