Changeset 9536 for code/branches/testing/src/libraries/core/Core.cc
- Timestamp:
- Mar 4, 2013, 10:47:26 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/testing/src/libraries/core/Core.cc
r9224 r9536 55 55 #include "util/Exception.h" 56 56 #include "util/output/LogWriter.h" 57 #include "util/output/OutputManager.h" 57 58 #include "util/Scope.h" 58 59 #include "util/ScopedSingletonManager.h" … … 180 181 181 182 // Set the correct log path and rewrite the log file with the correct log levels 182 LogWriter::getInstance().setLogPath(PathConfig::getLogPathString());183 OutputManager::getInstance().getLogWriter().setLogPath(PathConfig::getLogPathString()); 183 184 184 185 #if !defined(ORXONOX_PLATFORM_APPLE) && !defined(ORXONOX_USE_WINMAIN) … … 258 259 void Core::setConfigValues() 259 260 { 260 SetConfigValueExternal( LogWriter::getInstance().configurableMaxLevel_,261 LogWriter::getInstance().getConfigurableSectionName(),262 LogWriter::getInstance().getConfigurableMaxLevelName(),263 LogWriter::getInstance().configurableMaxLevel_)261 SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableMaxLevel_, 262 OutputManager::getInstance().getLogWriter().getConfigurableSectionName(), 263 OutputManager::getInstance().getLogWriter().getConfigurableMaxLevelName(), 264 OutputManager::getInstance().getLogWriter().configurableMaxLevel_) 264 265 .description("The maximum level of output shown in the log file") 265 .callback(static_cast<BaseWriter*>(& LogWriter::getInstance()), &BaseWriter::changedConfigurableLevel);266 SetConfigValueExternal( LogWriter::getInstance().configurableAdditionalContextsMaxLevel_,267 LogWriter::getInstance().getConfigurableSectionName(),268 LogWriter::getInstance().getConfigurableAdditionalContextsMaxLevelName(),269 LogWriter::getInstance().configurableAdditionalContextsMaxLevel_)266 .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableLevel); 267 SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableAdditionalContextsMaxLevel_, 268 OutputManager::getInstance().getLogWriter().getConfigurableSectionName(), 269 OutputManager::getInstance().getLogWriter().getConfigurableAdditionalContextsMaxLevelName(), 270 OutputManager::getInstance().getLogWriter().configurableAdditionalContextsMaxLevel_) 270 271 .description("The maximum level of output shown in the log file for additional contexts") 271 .callback(static_cast<BaseWriter*>(& LogWriter::getInstance()), &BaseWriter::changedConfigurableAdditionalContextsLevel);272 SetConfigValueExternal( LogWriter::getInstance().configurableAdditionalContexts_,273 LogWriter::getInstance().getConfigurableSectionName(),274 LogWriter::getInstance().getConfigurableAdditionalContextsName(),275 LogWriter::getInstance().configurableAdditionalContexts_)272 .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContextsLevel); 273 SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableAdditionalContexts_, 274 OutputManager::getInstance().getLogWriter().getConfigurableSectionName(), 275 OutputManager::getInstance().getLogWriter().getConfigurableAdditionalContextsName(), 276 OutputManager::getInstance().getLogWriter().configurableAdditionalContexts_) 276 277 .description("Additional output contexts shown in the log file") 277 .callback(static_cast<BaseWriter*>(& LogWriter::getInstance()), &BaseWriter::changedConfigurableAdditionalContexts);278 .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContexts); 278 279 279 280 SetConfigValue(bDevMode_, PathConfig::buildDirectoryRun())
Note: See TracChangeset
for help on using the changeset viewer.