[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.104,1.105 player_mod.cpp,2.14,2.15 player_v2.cpp,2.46,2.47 scummvm.cpp,2.587,2.588

Max Horn fingolfin at users.sourceforge.net
Tue Feb 24 14:56:05 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12241/scumm

Modified Files:
	dialogs.cpp player_mod.cpp player_v2.cpp scummvm.cpp 
Log Message:
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

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- dialogs.cpp	22 Feb 2004 07:14:48 -0000	1.104
+++ dialogs.cpp	24 Feb 2004 22:39:39 -0000	1.105
@@ -321,9 +321,7 @@
 }
 
 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::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() {

Index: player_mod.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.cpp,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -d -r2.14 -r2.15
--- player_mod.cpp	6 Jan 2004 12:45:30 -0000	2.14
+++ player_mod.cpp	24 Feb 2004 22:39:39 -0000	2.15
@@ -31,7 +31,7 @@
 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;
 

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.46
retrieving revision 2.47
diff -u -d -r2.46 -r2.47
--- player_v2.cpp	8 Jan 2004 20:37:25 -0000	2.46
+++ player_v2.cpp	24 Feb 2004 22:39:39 -0000	2.47
@@ -348,7 +348,7 @@
 	_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;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.587
retrieving revision 2.588
diff -u -d -r2.587 -r2.588
--- scummvm.cpp	24 Feb 2004 10:52:40 -0000	2.587
+++ scummvm.cpp	24 Feb 2004 22:39:39 -0000	2.588
@@ -314,7 +314,6 @@
 	  _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 @@
 	}
 
 	// 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;





More information about the Scummvm-git-logs mailing list