xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

overload some GfParm functions to take std::string & for file name 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8012 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2022-02-07 22:51:01 +00:00
parent c11ca25841
commit 0ff53ad5f4
25 changed files with 88 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/dandroid/src/dandroid.cpp
View File

@ -102,7 +102,7 @@ extern "C" int moduleWelcome(const tModWelcomeIn * welcomeIn,
setRobotName(welcomeIn->name);
// Filehandle for robot's xml-file
void* pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void* pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
PLogDANDROID = GfLogger::instance("DANDROID");
@ -209,7 +209,7 @@ extern "C" int dandroid(tModInfo * modInfo)
nameBuffer = "dandroid";
// Filehandle for robot's xml-file
void* pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void* pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
if (pRobotSettings)
{ // Let's look what we have to provide here

14
src/drivers/kilo2008/kdriver.cpp
View File

@ -646,7 +646,7 @@ void KDriver::initTrack(tTrack * t, void *carHandle,
// Try to load the default setup
botPath << "drivers/" << bot << "/"; // << INDEX << "/";
buf << botPath.str() << "default.xml";
*carParmHandle = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_STD);
*carParmHandle = GfParmReadFile(buf.str(), GFPARM_RMODE_STD);
#ifdef KDRIVER_DEBUG
GfLogInfo("KILO Default: %s\n", buf.str().c_str());
if (carParmHandle)
@ -656,7 +656,7 @@ void KDriver::initTrack(tTrack * t, void *carHandle,
// Try to load the track-based informations
buf.str(string());
buf << botPath.str() << "tracks/" << trackname;
void *newhandle = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_STD);
void *newhandle = GfParmReadFile(buf.str(), GFPARM_RMODE_STD);
#ifdef KDRIVER_DEBUG
GfLogInfo("KILO track-based: %s\n", buf.str().c_str());
if (newhandle)
@ -688,7 +688,7 @@ void KDriver::initTrack(tTrack * t, void *carHandle,
// Load setup tailored for car+track
buf.str(string());
buf << botPath.str() << car_type_ << "/" << trackname;
newhandle = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_STD);
newhandle = GfParmReadFile(buf.str(), GFPARM_RMODE_STD);
#ifdef KDRIVER_DEBUG
GfLogInfo("KILO custom setup: %s\n", buf.str().c_str());
if (newhandle)
@ -995,7 +995,7 @@ void* KDriver::LoadDefaultSetup() const {
buf << "/def-fast.xml";
} // if dRatio
ret = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_STD);
ret = GfParmReadFile(buf.str(), GFPARM_RMODE_STD);
#ifdef KDRIVER_DEBUG
GfLogInfo("KILO Decision of setup: %s\n", buf.str().c_str());
if (ret)
@ -1854,11 +1854,11 @@ double KDriver::InitSkill(tSituation * s) {
stringstream buf;
// load the global skill level, range 0 - 10
buf << GetLocalDir() << "config/raceman/extra/skill.xml";
void *skillHandle = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_REREAD);
void *skillHandle = GfParmReadFile(buf.str(), GFPARM_RMODE_REREAD);
if (!skillHandle) {
buf.str(string());
buf << GetDataDir() << "config/raceman/extra/skill.xml";
skillHandle = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_REREAD);
skillHandle = GfParmReadFile(buf.str(), GFPARM_RMODE_REREAD);
} // if !skillHandle
if (skillHandle) {
@ -1871,7 +1871,7 @@ double KDriver::InitSkill(tSituation * s) {
double driverSkill = 0.0;
buf.str(string());
buf << "drivers/" << bot << "/" << INDEX << "/skill.xml";
skillHandle = GfParmReadFile(buf.str().c_str(), GFPARM_RMODE_STD);
skillHandle = GfParmReadFile(buf.str(), GFPARM_RMODE_STD);
if (skillHandle) {
driverSkill = GfParmGetNum(skillHandle, KILO_SECT_SKILL,
KILO_SKILL_LEVEL, NULL, 0.0);

4
src/drivers/kilo2008/kilo2008.cpp
View File

@ -114,7 +114,7 @@ extern "C" int moduleWelcome(const tModWelcomeIn* welcomeIn,
setRobotName(welcomeIn->name);
// Filehandle for robot's xml-file
void *pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void *pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
if (pRobotSettings) { // robot settings XML could be read
NBBOTS = 0;
@ -207,7 +207,7 @@ extern "C" int kilo2008(tModInfo *modInfo) {
nameBuffer = "kilo2008";
// Filehandle for robot's xml-file
void *pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void *pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
if (pRobotSettings) { // Let's look what we have to provide here
ssBuf.str(string());

4
src/drivers/shadow/src/Shadow.cpp
View File

@ -117,7 +117,7 @@ extern "C" int moduleWelcome(const tModWelcomeIn* welcomeIn, tModWelcomeOut* wel
setRobotName(welcomeIn->name);
// Filehandle for robot's xml-file
void *pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void *pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
PLogSHADOW = GfLogger::instance("SHADOW");
@ -216,7 +216,7 @@ extern "C" int shadow(tModInfo *modInfo)
nameBuffer = "shadow";
// Filehandle for robot's xml-file
void *pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void *pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
if (pRobotSettings) // Let's look what we have to provide here
{

10
src/drivers/usr/src/MyParam.cpp
View File

@ -36,12 +36,12 @@ MyParam::MyParam(void** carparmhandle, const std::string& datadir, const std::st
LogUSR.info(" Load track file : %s\n", trackfile.c_str());
LogUSR.info(" Load default file : %s\n", defaultfile.c_str());
*carparmhandle = GfParmReadFile(trackfile.c_str(), GFPARM_RMODE_STD);
*carparmhandle = GfParmReadFile(trackfile, GFPARM_RMODE_STD);
if (*carparmhandle == NULL)
{
LogUSR.info("Couldn't load : %s\n", trackfile.c_str());
*carparmhandle = GfParmReadFile(defaultfile.c_str(), GFPARM_RMODE_STD);
*carparmhandle = GfParmReadFile(defaultfile, GFPARM_RMODE_STD);
if (*carparmhandle == NULL)
LogUSR.fatal("Couldn't load : %s\n", defaultfile.c_str());
@ -63,17 +63,17 @@ MyParam::MyParam(void** carparmhandle, const std::string& datadir, const std::st
LogUSR.info(" Load default file rain : %s\n", defaultfilerain.c_str());
LogUSR.info(" Load default file : %s\n", defaultfile.c_str());
*carparmhandle = GfParmReadFile(trackfilerain.c_str(), GFPARM_RMODE_STD);
*carparmhandle = GfParmReadFile(trackfilerain, GFPARM_RMODE_STD);
if (*carparmhandle == NULL)
{
LogUSR.info("Couldn't load : %s\n", trackfilerain.c_str());
*carparmhandle = GfParmReadFile(defaultfilerain.c_str(), GFPARM_RMODE_STD);
*carparmhandle = GfParmReadFile(defaultfilerain, GFPARM_RMODE_STD);
if (*carparmhandle == NULL)
{
LogUSR.info("Couldn't load : %s\n", defaultfilerain.c_str());
*carparmhandle = GfParmReadFile(defaultfile.c_str(), GFPARM_RMODE_STD);
*carparmhandle = GfParmReadFile(defaultfile, GFPARM_RMODE_STD);
if (*carparmhandle == NULL)
LogUSR.fatal("Couldn't load : %s\n", defaultfile.c_str());

3
src/drivers/usr/src/pit.cpp
View File

@ -42,8 +42,7 @@ void Pit::init(const tTrack* track, const tSituation* situation, MyCar* car, int
{
// Get tires change time
//void* handle = NULL;
/*std::string tmpstr = std::string(GetLocalDir()) + "config/raceman/endrace.xml";
handle = GfParmReadFile(tmpstr.c_str(), GFPARM_RMODE_STD);
/*handle = GfParmReadFileLocal("config/raceman/endrace.xml", GFPARM_RMODE_STD);
if (handle)
{
mTiresChangeTime = GfParmGetNum(handle, "Race", "all tires change time", (char*)NULL, 30.0);

4
src/drivers/usr/src/usr.cpp
View File

@ -116,7 +116,7 @@ extern "C" int moduleWelcome(const tModWelcomeIn* welcomeIn,
setRobotName(welcomeIn->name);
// Filehandle for robot's xml-file
void *pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void *pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
PLogUSR = GfLogger::instance("USR");
@ -218,7 +218,7 @@ extern "C" int usr(tModInfo *modInfo)
nameBuffer = "usr";
// Filehandle for robot's xml-file
void *pRobotSettings = GfParmReadFile(pathBuffer.c_str(), GFPARM_RMODE_STD);
void *pRobotSettings = GfParmReadFile(pathBuffer, GFPARM_RMODE_STD);
if (pRobotSettings) // Let's look what we have to provide here
{

25
src/libs/tgf/params.cpp
View File

@ -1253,6 +1253,11 @@ GfParmReadBuf (char *buffer)
void *
GfParmReadFileLocal(const std::string &file, int mode, bool neededFile)
{
return GfParmReadFileLocal(file.c_str(), mode, neededFile);
}
void *
GfParmReadFileLocal(const char *file, int mode, bool neededFile)
@ -1260,7 +1265,7 @@ GfParmReadFileLocal(const char *file, int mode, bool neededFile)
//use local dir
std::string fullPath(std::string(GfLocalDir()) + file);
return GfParmReadFile(fullPath.c_str(),mode,neededFile);
return GfParmReadFile(fullPath,mode,neededFile);
}
/** Read a configuration file.
@ -1275,6 +1280,12 @@ GfParmReadFileLocal(const char *file, int mode, bool neededFile)
@return handle on the configuration data
<br>0 if Error
*/
void *
GfParmReadFile(const std::string &file, int mode, bool neededFile, bool trace)
{
return GfParmReadFile(file.c_str(), mode, neededFile, trace);
}
void *
GfParmReadFile (const char *file, int mode, bool neededFile, bool trace)
{
@ -1737,13 +1748,18 @@ GfParmSetDTD (void *parmHandle, char *dtd, char*header)
}
int
GfParmWriteFileLocal(const std::string &file, void *parmHandle, const char *name)
{
return GfParmWriteFileLocal(file.c_str(), parmHandle, name);
}
int
GfParmWriteFileLocal(const char *file, void *parmHandle, const char *name)
{
//use local dir
std::string fullPath(std::string(GfLocalDir()) + file);
return GfParmWriteFile(fullPath.c_str(), parmHandle, name);
return GfParmWriteFile(fullPath, parmHandle, name);
}
/** Write a configuration file.
@ -1755,6 +1771,11 @@ GfParmWriteFileLocal(const char *file, void *parmHandle, const char *name)
<br>1 if Error
*/
int
GfParmWriteFile(const std::string &file, void *parmHandle, const char *name)
{
return GfParmWriteFile(file.c_str(), parmHandle, name);
}
int
GfParmWriteFile (const char *file, void *parmHandle, const char *name)
{
struct parmHandle *handle = (struct parmHandle *)parmHandle;

4
src/libs/tgf/tgf.h
View File

@ -404,14 +404,18 @@ TGF_API char* GfPathNormalizeFile(char* pszPath, size_t nMaxPathLen);
/* parameter file read */
TGF_API void *GfParmReadFileLocal(const char *file, int mode, bool neededFile = true);
TGF_API void *GfParmReadFileLocal(const std::string &file, int mode, bool neededFile = true);
/* last optional parameter allows usage without logger be available */
TGF_API void *GfParmReadFile(const char *file, int mode, bool neededFile = true, bool trace = true);
TGF_API void *GfParmReadFile(const std::string &file, int mode, bool neededFile = true, bool trace = true);
TGF_API void *GfParmReadBuf(char *buffer);
/* parameter file write */
TGF_API int GfParmWriteFileLocal(const char *file, void* handle, const char *name);
TGF_API int GfParmWriteFileLocal(const std::string &file, void *handle, const char *name);
TGF_API int GfParmWriteFile(const char *file, void* handle, const char *name);
TGF_API int GfParmWriteFile(const std::string &file, void *handle, const char *name);
/* last optional parameter allows usage without logger be available */
TGF_API int GfParmWriteFileSDHeader(const char *file, void* handle, const char *name, const char *author, bool trace = true);
/* write a parameter file to a supplied buffer */

2
src/libs/tgf/trace.cpp
View File

@ -163,7 +163,7 @@ void GfLogger::setup()
// 1) Open and load the logger settings file.
std::ostringstream ossParm;
ossParm << GfLocalDir() << LOGGING_CFG;
void* hparmlogSettings = GfParmReadFile(ossParm.str().c_str(), GFPARM_RMODE_STD);
void* hparmlogSettings = GfParmReadFile(ossParm.str(), GFPARM_RMODE_STD);
if(!hparmlogSettings)
{
GfLogDefault.warning("Failed to open or parse logger settings file %s\n",

4
src/libs/tgfclient/forcefeedback.cpp
View File

@ -94,7 +94,7 @@ void ForceFeedbackManager::readConfiguration(const std::string &carName){
//merge the current configuration with the read car specific configuration
//if there is one
void *paramHandle = GfParmReadFile(configFileUrl.c_str(), GFPARM_RMODE_STD);
void *paramHandle = GfParmReadFile(configFileUrl, GFPARM_RMODE_STD);
if(GfParmExistsSection(paramHandle, effectsSectionPathSpecific.c_str())){
this->readConfigurationFromFileSection(configFileUrl, effectsSectionPathSpecific);
}
@ -111,7 +111,7 @@ void ForceFeedbackManager::readConfigurationFromFileSection(const std::string &c
int paramValue = 0;
//open the file
void *paramHandle = GfParmReadFile(configFileUrl.c_str(), GFPARM_RMODE_STD);
void *paramHandle = GfParmReadFile(configFileUrl, GFPARM_RMODE_STD);
//for each section on the effectConfig section
if (GfParmListSeekFirst(paramHandle, effectsSectionPath.c_str()) == 0) {

4
src/libs/tgfdata/cars.cpp
View File

@ -101,7 +101,7 @@ GfCars::GfCars()
std::ostringstream ossCarFileName;
ossCarFileName << "cars/models/" << pszCarId << '/' << pszCarId << PARAMEXT;
void* hparmCar = GfParmReadFile(ossCarFileName.str().c_str(), GFPARM_RMODE_STD);
void* hparmCar = GfParmReadFile(ossCarFileName.str(), GFPARM_RMODE_STD);
if (!hparmCar)
{
GfLogInfo("Ignoring car %s (file %s not %s)\n",
@ -117,7 +117,7 @@ GfCars::GfCars()
// Little optimization : don't load category file if same as the previous car's.
std::ostringstream ossCatFileName;
ossCatFileName << "cars/categories/" << strCatId << PARAMEXT;
void* hparmCat = GfParmReadFile(ossCatFileName.str().c_str(), GFPARM_RMODE_STD);
void* hparmCat = GfParmReadFile(ossCatFileName.str(), GFPARM_RMODE_STD);
if (!hparmCat)
{
GfLogInfo("Ignoring car %s (category file %s not %s)\n",

4
src/libs/tgfdata/drivers.cpp
View File

@ -122,11 +122,11 @@ void GfDrivers::reload()
ossRobotFileName << "drivers/" << strModName
<< '/' << strModName << PARAMEXT;
void *hparmRobot =
GfParmReadFileLocal(ossRobotFileName.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
GfParmReadFileLocal(ossRobotFileName.str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
if (!hparmRobot)
{
hparmRobot =
GfParmReadFile(ossRobotFileName.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
GfParmReadFile(ossRobotFileName.str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
}
if (!hparmRobot)
{

2
src/libs/tgfdata/race.cpp
View File

@ -655,7 +655,7 @@ void GfRace::store()
std::ostringstream ossFilePath;
ossFilePath << "drivers/" << (*itComp)->getModuleName()
<< '/' << (*itComp)->getModuleName() << PARAMEXT;
void* hparmRobot = GfParmReadFileLocal(ossFilePath.str().c_str(), GFPARM_RMODE_STD);
void* hparmRobot = GfParmReadFileLocal(ossFilePath.str(), GFPARM_RMODE_STD);
ossDrvSecPath.str("");
ossDrvSecPath << ROB_SECT_ROBOTS << '/' << ROB_LIST_INDEX
<< '/' << (*itComp)->getInterfaceIndex();

8
src/libs/tgfdata/racemanagers.cpp
View File

@ -100,14 +100,14 @@ GfRaceManagers::GfRaceManagers()
// Open the XML descriptor file (look first in user settings, then in the install folder).
std::string strRaceManFileName("config/raceman/");
strRaceManFileName.append(pFile->name);
void* hparmRaceMan = GfParmReadFileLocal(strRaceManFileName.c_str(), GFPARM_RMODE_STD);
void* hparmRaceMan = GfParmReadFileLocal(strRaceManFileName, GFPARM_RMODE_STD);
if (!hparmRaceMan)
{
hparmRaceMan = GfParmReadFile(strRaceManFileName.c_str(), GFPARM_RMODE_STD);
hparmRaceMan = GfParmReadFile(strRaceManFileName, GFPARM_RMODE_STD);
// We got if from the data folder : write it to the user settings.
if (hparmRaceMan)
GfParmWriteFileLocal(strRaceManFileName.c_str(), hparmRaceMan, NULL);
GfParmWriteFileLocal(strRaceManFileName, hparmRaceMan, NULL);
}
std::string strRaceManId(pFile->name);
@ -339,7 +339,7 @@ void GfRaceManager::load() const
{
std::ostringstream ossSubFilePath;
ossSubFilePath << "config/raceman/" << psz1stSubFileName;
hparmHandle = GfParmReadFileLocal(ossSubFilePath.str().c_str(), GFPARM_RMODE_STD);
hparmHandle = GfParmReadFileLocal(ossSubFilePath.str(), GFPARM_RMODE_STD);
}
if (!psz1stSubFileName || !hparmHandle)
{

2
src/libs/tgfdata/tracks.cpp
View File

@ -208,7 +208,7 @@ const std::vector<std::string>& GfTracks::getCategoryNames() const
{
std::ostringstream ossFileName;
ossFileName << "data/tracks/" << *itCatId << '.' << TRKEXT;
void* hparmCat = GfParmReadFile(ossFileName.str().c_str(), GFPARM_RMODE_STD);
void* hparmCat = GfParmReadFile(ossFileName.str(), GFPARM_RMODE_STD);
const char* pszCatName;
if (!hparmCat)
{

4
src/modules/csnetworking/csnetwork.cpp
View File

@ -363,7 +363,7 @@ int NetNetwork::GetDriverIdx()
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
int nDriverIdx = -1;
@ -731,7 +731,7 @@ void NetNetwork::GetHostSettings(std::string &strCarCat,bool &bCollisions)
{
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
strCarCat = GfParmGetStr(params, RM_SECT_HEADER,RM_ATTR_CAR_CATEGORY,"All");

10
src/modules/csnetworking/csserver.cpp
View File

@ -231,13 +231,13 @@ void NetServer::SetHostSettings(const char *pszCarCat,bool bCollisions)
{
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
const char *pName =GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, "");
GfParmSetStr(params, RM_SECT_HEADER,RM_ATTR_CAR_CATEGORY, pszCarCat);
GfParmWriteFileLocal(m_strRaceXMLFile.c_str(), params, pName);
GfParmWriteFileLocal(m_strRaceXMLFile, params, pName);
}
@ -245,7 +245,7 @@ void NetServer::GenerateDriversForXML()
{
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
const char *pName =GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, "");
@ -286,7 +286,7 @@ void NetServer::GenerateDriversForXML()
UnlockServerData();
//Save our changes
GfParmWriteFileLocal(m_strRaceXMLFile.c_str(), params, pName);
GfParmWriteFileLocal(m_strRaceXMLFile, params, pName);
GfParmWriteFileLocal("config/raceman/netclient.tmp", params, pName);
}
@ -307,7 +307,7 @@ void NetServer::SetLocalDrivers()
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
//const char *pName =GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, "");

4
src/modules/graphic/osggraph/Viewer/OsgHUD.cpp
View File

@ -1455,7 +1455,7 @@ void SDHUD::ToggleHUDwidget(const std::string &widget)
int value = hudWidgets[widget]->getNodeMask();
//read the config file, update the value and write it back
void *paramHandle = GfParmReadFile(configFileUrl.c_str(), GFPARM_RMODE_STD);
void *paramHandle = GfParmReadFile(configFileUrl, GFPARM_RMODE_STD);
GfParmSetNum(paramHandle, path.c_str(), attribute.c_str(), NULL, (int)value);
GfParmWriteFile(NULL, paramHandle, "osghudconfig");
}
@ -1507,7 +1507,7 @@ osg::ref_ptr <osg::Group> SDHUD::generateHudFromXmlFile(int scrH, int scrW)
// int paramValue = 0;
//open the file
void *paramHandle = GfParmReadFile(configFileUrl.c_str(), GFPARM_RMODE_STD);
void *paramHandle = GfParmReadFile(configFileUrl, GFPARM_RMODE_STD);
//GfLogInfo("OSGHUD: Try to find all mains sections: %s \n", subSectionName.c_str());

4
src/modules/networking/network.cpp
View File

@ -359,7 +359,7 @@ int NetNetwork::GetDriverIdx()
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
int nDriverIdx = -1;
@ -748,7 +748,7 @@ void NetNetwork::GetHostSettings(std::string &strCarCat,bool &bCollisions)
{
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
strCarCat = GfParmGetStr(params, RM_SECT_HEADER,RM_ATTR_CAR_CATEGORY,"All");

10
src/modules/networking/server.cpp
View File

@ -233,20 +233,20 @@ void NetServer::SetHostSettings(const char *pszCarCat, bool bCollisions)
{
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
const char *pName =GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, "");
GfParmSetStr(params, RM_SECT_HEADER,RM_ATTR_CAR_CATEGORY, pszCarCat);
GfParmWriteFileLocal(m_strRaceXMLFile.c_str(), params, pName);
GfParmWriteFileLocal(m_strRaceXMLFile, params, pName);
}
void NetServer::GenerateDriversForXML()
{
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
const char *pName =GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, "");
@ -290,7 +290,7 @@ void NetServer::GenerateDriversForXML()
UnlockServerData();
//Save our changes
GfParmWriteFileLocal(m_strRaceXMLFile.c_str(), params, pName);
GfParmWriteFileLocal(m_strRaceXMLFile, params, pName);
}
void NetServer::SetLocalDrivers()
@ -314,7 +314,7 @@ void NetServer::SetLocalDrivers()
assert(m_strRaceXMLFile!="");
void *params = GfParmReadFileLocal(m_strRaceXMLFile.c_str(),GFPARM_RMODE_STD);
void *params = GfParmReadFileLocal(m_strRaceXMLFile,GFPARM_RMODE_STD);
assert(params);
//const char *pName =GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, "");

8
src/modules/userinterface/legacymenu/racescreens/carsetupmenu.cpp
View File

@ -329,7 +329,7 @@ void CarSetupMenu::loadSettings()
std::ostringstream ossCarFileName;
std::string strCarId = getCar()->getId();
ossCarFileName << "cars/models/" << strCarId << '/' << strCarId << PARAMEXT;
void *hparmCar = GfParmReadFile(ossCarFileName.str().c_str(), GFPARM_RMODE_STD);
void *hparmCar = GfParmReadFile(ossCarFileName.str(), GFPARM_RMODE_STD);
if (!hparmCar)
{
GfLogError("Car %s (file %s not %s)\n",
@ -344,7 +344,7 @@ void CarSetupMenu::loadSettings()
std::ostringstream ossCarSetupFileName;
std::string strTrackId = getTrack()->getId();
ossCarSetupFileName << GfLocalDir() << "drivers/human/cars/" << strCarId << '/' << strTrackId << PARAMEXT;
void *hparmCarSetup = GfParmReadFile(ossCarSetupFileName.str().c_str(), GFPARM_RMODE_STD);
void *hparmCarSetup = GfParmReadFile(ossCarSetupFileName.str(), GFPARM_RMODE_STD);
if (!hparmCarSetup)
{
GfLogInfo("Car Setup: %s/%s (file %s not %s)\n",
@ -501,7 +501,7 @@ void CarSetupMenu::storeSettings()
std::string strCarId = getCar()->getId();
std::string strTrackId = getTrack()->getId();
ossCarSetupFileName << GfLocalDir() << "drivers/human/cars/" << strCarId << '/' << strTrackId << PARAMEXT;
void *hparmCarSetup = GfParmReadFile(ossCarSetupFileName.str().c_str(), GFPARM_RMODE_STD);
void *hparmCarSetup = GfParmReadFile(ossCarSetupFileName.str(), GFPARM_RMODE_STD);
if (!hparmCarSetup)
{
// Create the car setup file directory if it doesn't exist.
@ -510,7 +510,7 @@ void CarSetupMenu::storeSettings()
if (!GfDirExists(strDir.c_str()))
GfDirCreate(strDir.c_str());
hparmCarSetup = GfParmReadFile(ossCarSetupFileName.str().c_str(),
hparmCarSetup = GfParmReadFile(ossCarSetupFileName.str(),
GFPARM_RMODE_STD | GFPARM_RMODE_CREAT | GFPARM_TEMPLATE);
if (!hparmCarSetup)
{

6
src/modules/userinterface/legacymenu/racescreens/csnetworkingmenu.cpp
View File

@ -246,7 +246,7 @@ UpdateNetworkPlayers()
pNetwork->SetCurrentDriver();
//reload xml file
reInfo->params = GfParmReadFileLocal(g_strTempConfig.c_str(),GFPARM_RMODE_REREAD);
reInfo->params = GfParmReadFileLocal(g_strTempConfig,GFPARM_RMODE_REREAD);
assert(reInfo->params);
// Scan each of the human drivers to see if they're active in this race
@ -745,7 +745,7 @@ static void rmConvertDriversForNetwork()
tRmInfo* reInfo = LmRaceEngine().inData();
// ensure the system knows about 'new' network drivers
reInfo->params = GfParmReadFileLocal(g_strTempConfig.c_str(),GFPARM_RMODE_REREAD);
reInfo->params = GfParmReadFileLocal(g_strTempConfig,GFPARM_RMODE_REREAD);
reInfo->_reName = GfParmGetStr(reInfo->params, RM_SECT_HEADER, RM_ATTR_NAME, "");
}
@ -851,7 +851,7 @@ rmCarSettingsMenu(void *pMenu)
assert(g_strTempConfig != "");
tRmInfo* reInfo = LmRaceEngine().inData();
reInfo->params = GfParmReadFileLocal(g_strTempConfig.c_str(),GFPARM_RMODE_REREAD);
reInfo->params = GfParmReadFileLocal(g_strTempConfig,GFPARM_RMODE_REREAD);
reInfo->_reName = GfParmGetStr(reInfo->params, RM_SECT_HEADER, RM_ATTR_NAME, "");
sprintf(dname, "%s/%d", RM_SECT_DRIVERS, nDriverIdx);

4
src/modules/userinterface/legacymenu/racescreens/racemanmenu.cpp
View File

@ -131,7 +131,7 @@ rmLoadRaceFromConfigFile(const char *filename)
// Update the race manager.
void* hparmRaceMan =
GfParmReadFile(strMainFileName.c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
GfParmReadFile(strMainFileName, GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
if (hparmRaceMan)
{
pRaceMan->reset(hparmRaceMan, /* bClosePrevHdle= */ true);
@ -160,7 +160,7 @@ rmLoadRaceFromResultsFile(const char *filename)
// (Re-)initialize the race from the selected race manager and results params.
void* hparmResults =
GfParmReadFile(ossResFileName.str().c_str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
GfParmReadFile(ossResFileName.str(), GFPARM_RMODE_STD | GFPARM_RMODE_REREAD);
if (hparmResults)
{
LmRaceEngine().race()->load(pRaceMan, /*bKeepHumans=*/true, hparmResults);

4
src/tools/menuview/previewmenu.cpp
View File

@ -102,9 +102,9 @@ LoadMenuScreen()
NULL, (tfuiCallback)NULL,
1);
void *param = GfParmReadFile(g_strFile.c_str(), GFPARM_RMODE_REREAD);
void *param = GfParmReadFile(g_strFile, GFPARM_RMODE_REREAD);
if (!param)
param = GfParmReadFileLocal(g_strFile.c_str(), GFPARM_RMODE_REREAD);
param = GfParmReadFileLocal(g_strFile, GFPARM_RMODE_REREAD);
GfuiMenuCreateStaticControls(menuHandle, param);