From d158280425efac5f4ec72e00fb2b7389cdfb5a75 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 24 Feb 2004 22:39:42 +0000
Subject: the OSystem changes we discussed on the ML (note: renaming of the
 existing OSystem API is not yet finished); porters will have to fix their
 ports to get them to compile again

svn-id: r13036
---
 sky/music/adlibmusic.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'sky/music/adlibmusic.cpp')

diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp
index 0f605b2a65..5a0a8d468b 100644
--- a/sky/music/adlibmusic.cpp
+++ b/sky/music/adlibmusic.cpp
@@ -33,16 +33,13 @@ void AdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) {
 
 AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk, OSystem *system)
 	: MusicBase(pDisk, system) {
-
+	
 	_driverFileBase = 60202;
 	_mixer = pMixer;
 	_sampleRate = pMixer->getOutputRate();
+	
+	_opl = makeAdlibOPL(_sampleRate);
 
-	int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL);   
-	int eg_ent = g_system->property(OSystem::PROP_GET_FMOPL_EG_ENT, NULL);   
-	OPLBuildTables((env_bits ? env_bits : FMOPL_ENV_BITS_HQ), (eg_ent ? eg_ent : FMOPL_EG_ENT_HQ));
-	_opl = OPLCreate(OPL_TYPE_YM3812, 3579545, _sampleRate);
-  
 	_mixer->setupPremix(passMixerFunc, this);
 }
 
-- 
cgit v1.2.3