o changed to new configfile load methods

o added pspoverclock config flag,because overclocking was default setting which is not desired by all users
o moved psp overclock call away from ctor


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@782 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
optixx 2005-09-18 14:31:37 +00:00
parent d5b741362a
commit 1417e20102
2 changed files with 13 additions and 7 deletions

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystemPSP.cxx,v 1.2 2005-08-30 01:10:54 stephena Exp $ // $Id: OSystemPSP.cxx,v 1.3 2005-09-18 14:31:36 optixx Exp $
//============================================================================ //============================================================================
#include <cstdlib> #include <cstdlib>
@ -66,7 +66,7 @@ OSystemPSP::OSystemPSP()
string userPropertiesFile = basedir + "/stella.pro"; string userPropertiesFile = basedir + "/stella.pro";
string systemPropertiesFile = "/etc/stella.pro"; string systemPropertiesFile = "/etc/stella.pro";
setPropertiesFiles(userPropertiesFile, systemPropertiesFile); setConfigFiles(userPropertiesFile, systemPropertiesFile);
string userConfigFile = basedir + "/stellarc"; string userConfigFile = basedir + "/stellarc";
string systemConfigFile = "/etc/stellarc"; string systemConfigFile = "/etc/stellarc";
@ -75,8 +75,6 @@ OSystemPSP::OSystemPSP()
string cacheFile = basedir + "/stella.cache"; string cacheFile = basedir + "/stella.cache";
setCacheFile(cacheFile); setCacheFile(cacheFile);
// Overclock CPU to 333MHz
scePowerSetClockFrequency(333,333,166);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -98,6 +96,15 @@ void OSystemPSP::mainLoop()
virtualTime = getTicks(); virtualTime = getTicks();
frameTime = 0; frameTime = 0;
// Overclock CPU to 333MHz
if (settings().getBool("pspoverclock"))
{
scePowerSetClockFrequency(333,333,166);
fprintf(stderr,"OSystemPSP::mainLoop overclock to 333\n");
} else
{
fprintf(stderr,"OSystemPSP::mainLoop NOT overclock\n");
}
// Main game loop // Main game loop
for(;;) for(;;)
{ {

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: SettingsPSP.cxx,v 1.1 2005-08-25 15:19:17 stephena Exp $ // $Id: SettingsPSP.cxx,v 1.2 2005-09-18 14:31:37 optixx Exp $
//============================================================================ //============================================================================
#include "bspf.hxx" #include "bspf.hxx"
@ -28,9 +28,8 @@ SettingsPSP::SettingsPSP(OSystem* osystem)
set("zoom", "1"); set("zoom", "1");
set("romdir", "ms0:/stella/roms/"); set("romdir", "ms0:/stella/roms/");
set("ssdir", "ms0:/stella/snapshots/"); set("ssdir", "ms0:/stella/snapshots/");
set("grabmouse", "1");
set("sound", "true"); set("sound", "true");
set("pspoverclock", "false");
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -