--- np2/cbus/boardspb.c 2004/02/03 08:24:40 1.5 +++ np2/cbus/boardspb.c 2005/02/09 20:11:33 1.7 @@ -188,7 +188,7 @@ void boardspb_reset(void) { fmtimer_reset(np2cfg.spbopt & 0xc0); opn.channels = 6; opngen_setcfg(6, OPN_STEREO | 0x03f); - soundrom_loadex(np2cfg.spbopt & 7, "SPB"); + soundrom_loadex(np2cfg.spbopt & 7, OEMTEXT("SPB")); opn.base = ((np2cfg.spbopt & 0x10)?0x000:0x100); } @@ -200,7 +200,7 @@ void boardspb_bind(void) { fmboard_rhyrestore(&rhythm, 0); sound_streamregist(&opngen, (SOUNDCB)opngen_getpcmvr); sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm); - sound_streamregist(&rhythm, (SOUNDCB)rhythm_getpcm); + rhythm_bind(&rhythm); sound_streamregist(&adpcm, (SOUNDCB)adpcm_getpcm); cbuscore_attachsndex(0x188 - opn.base, spb_o, spb_i); } @@ -221,7 +221,7 @@ void boardspr_reset(void) { opn.reg[0x2ff] = 0; opn.channels = 12; opngen_setcfg(12, OPN_STEREO | 0x03f); - soundrom_loadex(np2cfg.spbopt & 7, "SPB"); + soundrom_loadex(np2cfg.spbopt & 7, OEMTEXT("SPB")); opn.base = (np2cfg.spbopt & 0x10)?0x000:0x100; } @@ -235,7 +235,7 @@ void boardspr_bind(void) { fmboard_rhyrestore(&rhythm, 0); sound_streamregist(&opngen, (SOUNDCB)opngen_getpcmvr); sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm); - sound_streamregist(&rhythm, (SOUNDCB)rhythm_getpcm); + rhythm_bind(&rhythm); sound_streamregist(&adpcm, (SOUNDCB)adpcm_getpcm); cbuscore_attachsndex(0x188 - opn.base, spb_o, spb_i); cbuscore_attachsndex(0x588 - opn.base, spr_o, spr_i);