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, 8 insertions, 14 deletions

diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index e663085cfe..ce7884eb48 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -321,9 +321,7 @@ MainMenuDialog::~MainMenuDialog() {
 }
 
 void MainMenuDialog::open() {
-	OSystem::Property prop;
-	prop.show_keyboard = true;
-	g_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 
 	ScummDialog::open();
 }
@@ -360,12 +358,9 @@ void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
 }
 
 void MainMenuDialog::close() {
-	OSystem::Property prop;
-
 	ScummDialog::close();
 
-	prop.show_keyboard = false;
-	g_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 }
 
 void MainMenuDialog::save() {
diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp
index 2c4d197c63..64ad8e4eae 100644
--- a/scumm/player_mod.cpp
+++ b/scumm/player_mod.cpp
@@ -31,7 +31,7 @@ namespace Scumm {
 Player_MOD::Player_MOD(ScummEngine *scumm) {
 	int i;
 	_mixer = scumm->_mixer;
-	_samplerate = scumm->_system->property(OSystem::PROP_GET_SAMPLE_RATE, 0);
+	_samplerate = scumm->_system->getOutputSampleRate();
 	_mixamt = 0;
 	_mixpos = 0;
 
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index e44cb7ae98..53d9b88cee 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -348,7 +348,7 @@ Player_V2::Player_V2(ScummEngine *scumm, bool pcjr) {
 	_vm = scumm;
 	_system = scumm->_system;
 	_mixer = scumm->_mixer;
-	_sample_rate = _system->property(OSystem::PROP_GET_SAMPLE_RATE, 0);
+	_sample_rate = _system->getOutputSampleRate();
 	_mutex = _system->create_mutex();
 
 	_header_len = (scumm->_features & GF_OLD_BUNDLE) ? 4 : 6;
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 4154bfb7c1..a66c7a8c1d 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -314,7 +314,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 	  _features(gs.features),
 	  gdi(this), _pauseDialog(0), _optionsDialog(0), _mainMenuDialog(0),
 	  _targetName(detector->_targetName) {
-	OSystem::Property prop;
 
 	// Init all vars - maybe now we can get rid of our custom new/delete operators?
 	_imuse = NULL;
@@ -666,10 +665,10 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 	}
 
 	// Initialize backend
-	syst->init_size(_screenWidth, _screenHeight);
-	prop.cd_num = ConfMan.getInt("cdrom");
-	if (prop.cd_num >= 0 && (_features & GF_AUDIOTRACKS))
-		syst->property(OSystem::PROP_OPEN_CD, &prop);
+	syst->initSize(_screenWidth, _screenHeight);
+	int cd_num = ConfMan.getInt("cdrom");
+	if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
+		syst->openCD(cd_num);
 
 	// Setup GDI object
 	gdi._numStrips = _screenWidth / 8;