ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Apply gregory's patch for inconsistent "setLogsDir / SetLogsFolder" usage. 

* Fix slomo hotkey (issue 725)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3139 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-06-01 11:27:10 +00:00
parent 899e691781
commit 1083b658b3
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/PluginManager.cpp
View File

@ -137,7 +137,7 @@ static s32 CALLBACK fallback_freeze(int mode, freezeData *data)
static void CALLBACK fallback_keyEvent(keyEvent *ev) {}
static void CALLBACK fallback_setSettingsDir(const char* dir) {}
static void CALLBACK fallback_SetLogFolder(const char* dir) {}
static void CALLBACK fallback_setLogDir(const char* dir) {}
static void CALLBACK fallback_configure() {}
static void CALLBACK fallback_about() {}
static s32 CALLBACK fallback_test() { return 0; }
@ -292,7 +292,7 @@ static const LegacyApi_CommonMethod s_MethMessCommon[] =
{ "keyEvent", (vMeth*)fallback_keyEvent },
{ "setSettingsDir", (vMeth*)fallback_setSettingsDir },
{ "SetLogFolder", (vMeth*)fallback_SetLogFolder },
{ "setLogDir", (vMeth*)fallback_setLogDir },
{ "freeze", (vMeth*)fallback_freeze },
{ "test", (vMeth*)fallback_test },

2
pcsx2/gui/GlobalCommands.cpp
View File

@ -271,7 +271,7 @@ static const GlobalCommandDescriptor CommandDeclarations[] =
},
{ "Framelimiter_SlomoToggle",
Implementations::Framelimiter_TurboToggle,
Implementations::Framelimiter_SlomoToggle,
NULL,
NULL,
},

2
plugins/FWnull/FW.cpp
View File

@ -44,7 +44,7 @@ void LogInit()
FWLog.Open(LogFile);
}
EXPORT_C_(void) PADSetLogFolder(const char* dir)
EXPORT_C_(void) FWsetLogDir(const char* dir)
{
// Get the path to the log directory.
s_strLogPath = (dir==NULL) ? "logs/" : dir;

2
plugins/USBnull/USB.cpp
View File

@ -40,7 +40,7 @@ void LogInit()
USBLog.Open(LogFile);
}
EXPORT_C_(void) PADSetLogFolder(const char* dir)
EXPORT_C_(void) USBsetLogDir(const char* dir)
{
// Get the path to the log directory.
s_strLogPath = (dir==NULL) ? "logs/" : dir;

2
plugins/dev9null/DEV9.cpp
View File

@ -56,7 +56,7 @@ void LogInit()
Dev9Log.Open(LogFile);
}
EXPORT_C_(void) PADSetLogFolder(const char* dir)
EXPORT_C_(void) DEV9setLogDir(const char* dir)
{
// Get the path to the log directory.
s_strLogPath = (dir==NULL) ? "logs/" : dir;

2
plugins/zeropad/zeropad.cpp
View File

@ -290,7 +290,7 @@ void CALLBACK PADsetSettingsDir(const char* dir)
s_strIniPath = (dir==NULL) ? "inis/" : dir;
}
void CALLBACK PADSetLogFolder(const char* dir)
void CALLBACK PADsetLogDir(const char* dir)
{
// Get the path to the log directory.
s_strLogPath = (dir==NULL) ? "logs/" : dir;