aboutsummaryrefslogtreecommitdiff
path: root/sky/adlibchannel.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-04 21:17:42 +0000
committerMax Horn2003-05-04 21:17:42 +0000
commit325c9b321c8f8b63f777c96833e2f27c7695cabf (patch)
tree2d8ab75b5d9c1f751d6f326b3dfc1154c826558e /sky/adlibchannel.cpp
parent9659a4b4ed705a0a82b2b52245e7c096536b78a1 (diff)
downloadscummvm-rg350-325c9b321c8f8b63f777c96833e2f27c7695cabf.tar.gz
scummvm-rg350-325c9b321c8f8b63f777c96833e2f27c7695cabf.tar.bz2
scummvm-rg350-325c9b321c8f8b63f777c96833e2f27c7695cabf.zip
new fmopl (from adplug, which has it from mame; we can use it under the LGPL should we ever have to)
svn-id: r7328
Diffstat (limited to 'sky/adlibchannel.cpp')
-rw-r--r--sky/adlibchannel.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sky/adlibchannel.cpp b/sky/adlibchannel.cpp
index 60a43ed4f4..c277a66de5 100644
--- a/sky/adlibchannel.cpp
+++ b/sky/adlibchannel.cpp
@@ -20,11 +20,11 @@
*/
#include "adlibchannel.h"
+#include "sound/fmopl.h"
-SkyAdlibChannel::SkyAdlibChannel(uint8 *pMusicData, uint16 startOfData, FM_OPL *pOpl)
+SkyAdlibChannel::SkyAdlibChannel(uint8 *pMusicData, uint16 startOfData)
{
_musicData = pMusicData;
- _opl = pOpl;
_channelData.startOfData = startOfData;
_channelData.eventDataPtr = startOfData;
_channelData.channelActive = 1;
@@ -62,7 +62,8 @@ void SkyAdlibChannel::updateVolume(uint16 pVolume) {
void SkyAdlibChannel::setRegister(uint8 regNum, uint8 value) {
if (_adlibRegMirror[regNum] != value) {
- OPLWriteReg(_opl,regNum,value);
+ YM3812Write(0, 0, regNum);
+ YM3812Write(0, 1, value);
_adlibRegMirror[regNum] = value;
}
}