piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up the filemon a bit, added isEnable function to the logmanager

Browse Source 
and moved the FileMonitor from debug to discio to prevert cross 
dependencies


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4197 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-09-04 11:34:21 +00:00
parent 7badedf054
commit e147b9eb91
11 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Src/LogManager.h
View File

@ -133,13 +133,13 @@ private:
class LogManager
{
private:
LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
Common::CriticalSection logMutex;
FileLogListener *m_fileLog;
ConsoleListener *m_consoleLog;
static LogManager *m_logManager; // Singleton. Ugh.
public:
LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
static u32 GetMaxLevel() { return MAX_LOGLEVEL; }
void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
@ -153,6 +153,10 @@ public:
m_Log[type]->setEnable(enable);
}
bool isEnable(LogTypes::LOG_TYPE type) {
return m_Log[type]->isEnable();
}
const char *getShortName(LogTypes::LOG_TYPE type) const {
return m_Log[type]->getShortName();
}

6
Source/Core/Common/Src/StringUtil.cpp
View File

@ -372,12 +372,6 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
}
#endif
std::string PathToFilename(std::string Path)
{
std::string Name, Ending;
SplitPath(Path, 0, &Name, &Ending);
return Name + Ending;
}
void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename)
{

2
Source/Core/Common/Src/StringUtil.h
View File

@ -74,8 +74,6 @@ int ChooseStringFrom(const char* str, const char* * items);
// "C:\Windows\winhelp.exe" to "C:\Windows\", "winhelp", "exe"
bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension);
// "C:\Windows\winhelp.exe" to "winhelp.exe"
std::string PathToFilename(std::string Path);
void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename);
void NormalizeDirSep(std::string* str);