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

4 files changed, 7 insertions, 14 deletions

diff --git a/sky/control.cpp b/sky/control.cpp
index dbeff2c5e5..61def9a1ce 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -803,11 +803,9 @@ uint16 Control::saveRestorePanel(bool allowSave) {
 	uint16 cnt;
 	uint8 lookListLen;
 	if (allowSave) {
-		OSystem::Property prop;	
 		lookList = _savePanLookList;
 		lookListLen = 6;
-		prop.show_keyboard = true;
-		_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+		_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 	} else {
 		lookList = _restorePanLookList;
 		if (autoSaveExists())
@@ -915,9 +913,7 @@ uint16 Control::saveRestorePanel(bool allowSave) {
 	free(saveGameTexts);
 
 	if (allowSave) {
-		OSystem::Property prop;
-		prop.show_keyboard = false;
-		_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+		_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 	}
 		
 	return clickRes;
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);
 }
 
diff --git a/sky/screen.cpp b/sky/screen.cpp
index a6bced09f2..b471bbed28 100644
--- a/sky/screen.cpp
+++ b/sky/screen.cpp
@@ -57,7 +57,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk) {
 	int i;
 	uint8 tmpPal[1024];
 
-	_system->init_size(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
+	_system->initSize(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
 	_gameGrid = (uint8 *)malloc(GRID_X * GRID_Y * 2);
 	forceRefresh();
 
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 5556e1c500..f149e4988c 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -127,7 +127,7 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
 
 	_fastMode = 0;
 
-	_system->init_size(320, 200);
+	_system->initSize(320, 200);
 }
 
 SkyEngine::~SkyEngine() {