From fd67041d4e22bc368b4cc6d0e39ec0ca154245d4 Mon Sep 17 00:00:00 2001 From: jeblanchard Date: Mon, 9 Jun 2008 11:58:21 +0000 Subject: [PATCH] Convenience check-in (makes configSys an iota less buggy) --- src/drivers/common/configSys.cpp | 6 +++--- src/drivers/sdl/sdl.cpp | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/drivers/common/configSys.cpp b/src/drivers/common/configSys.cpp index 35be9e47..eb3495bf 100644 --- a/src/drivers/common/configSys.cpp +++ b/src/drivers/common/configSys.cpp @@ -47,7 +47,7 @@ Config::_addOption(char shortArg, break; default: break; - } + } _shortArgMap[shortArg] = name; _longArgMap[longArg] = name; @@ -85,7 +85,7 @@ Config::_addOption(const std::string &longArg, break; default: break; - } + } _longArgMap[longArg] = name; return 0; @@ -662,7 +662,7 @@ Config::save() int_i->first.c_str(), int_i->second); config.write(buf, strlen(buf)); } - for(dbl_i = _dblOptMap.begin(); dbl_i != _dblOptMap.end(); int_i++) { + for(dbl_i = _dblOptMap.begin(); dbl_i != _dblOptMap.end(); dbl_i++) { snprintf(buf, 1024, "%s = %f\n", dbl_i->first.c_str(), dbl_i->second); config.write(buf, strlen(buf)); diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp index f5c6b238..6a4f201e 100644 --- a/src/drivers/sdl/sdl.cpp +++ b/src/drivers/sdl/sdl.cpp @@ -233,12 +233,12 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count); static void DoFun(int frameskip) { - uint8 *gfx; + uint8 *gfx; int32 *sound; int32 ssize; static int fskipc = 0; static int opause = 0; - + #ifdef FRAMESKIP fskipc = (fskipc + 1) % (frameskip + 1); #endif @@ -290,7 +290,7 @@ DriverInitialize(FCEUGI *gi) static void DriverKill() { - //SaveConfig(); + //g_config->save(); #ifndef WIN32 // XXX soules - capturing all these signals seems pointless @@ -343,7 +343,7 @@ FCEUD_Update(uint8 *XBuf, Count-=can; if(Count) { if(NoWaiting) { - can=GetWriteSound(); + can=GetWriteSound(); if(Count>can) Count=can; WriteSound(Buffer,Count); } else { @@ -402,7 +402,7 @@ std::fstream* FCEUD_UTF8_fstream(const char *n, const char *m) mode |= std::ios_base::in | std::ios_base::out | std::ios_base::trunc; else if(!strcmp(m,"a+") || !strcmp(m,"a+b")) mode |= std::ios_base::in | std::ios_base::out | std::ios_base::app; - + return new std::fstream(n,mode); } @@ -546,7 +546,7 @@ FCEUD_GetTimeFreq(void) * Prints a textual message without adding a newline at the end. * * @param text The text of the message. -* +* * TODO: This function should have a better name. **/ void FCEUD_Message(const char *text) @@ -579,10 +579,10 @@ DUMMY(FCEUD_MovieReplayFrom) DUMMY(FCEUD_ToggleStatusIcon) DUMMY(FCEUD_AviRecordTo) DUMMY(FCEUD_AviStop) -void FCEUI_AviVideoUpdate(const unsigned char* buffer) { } -int FCEUD_ShowStatusIcon(void) {return 0;} +void FCEUI_AviVideoUpdate(const unsigned char* buffer) { } +int FCEUD_ShowStatusIcon(void) {return 0;} bool FCEUI_AviIsRecording(void) {return false;} -void FCEUI_UseInputPreset(int preset) { } +void FCEUI_UseInputPreset(int preset) { } bool FCEUD_PauseAfterPlayback() { return false; } bool moviePleaseLogSavestates = false;