From af4ee165df2514ed65fa4980e86e80838c49f268 Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Tue, 11 May 2004 18:48:32 +0000 Subject: [PATCH] Rename the channel name for the mixer Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1791 --- src/hardware/adlib.cpp | 2 +- src/hardware/pcspeaker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardware/adlib.cpp b/src/hardware/adlib.cpp index d763aafb..0a967a3f 100644 --- a/src/hardware/adlib.cpp +++ b/src/hardware/adlib.cpp @@ -170,7 +170,7 @@ void OPL_Init(Section* sec,Bitu base,OPL_Mode oplmode,Bitu rate) { opl.last_used=0; opl.mode=oplmode; - opl.chan=MIXER_AddChannel(OPL_CallBack,rate,"ADLIB"); + opl.chan=MIXER_AddChannel(OPL_CallBack,rate,"FM"); MIXER_SetMode(opl.chan,(opl.mode>OPL_opl2) ? MIXER_16STEREO : MIXER_16MONO); MIXER_Enable(opl.chan,false); }; diff --git a/src/hardware/pcspeaker.cpp b/src/hardware/pcspeaker.cpp index 68622121..6c9b6ba7 100644 --- a/src/hardware/pcspeaker.cpp +++ b/src/hardware/pcspeaker.cpp @@ -223,7 +223,7 @@ void PCSPEAKER_Init(Section* sec) { spkr.wave.count.half=spkr.wave.new_count.half=(0x10000 << SPKR_SHIFT)/2; /* Register the sound channel */ - spkr.chan=MIXER_AddChannel(&PCSPEAKER_CallBack,spkr.hw.rate,"PC-SPEAKER"); + spkr.chan=MIXER_AddChannel(&PCSPEAKER_CallBack,spkr.hw.rate,"SPKR"); MIXER_Enable(spkr.chan,false); MIXER_SetMode(spkr.chan,MIXER_16MONO); }