diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-12-03 13:32:07 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-12-03 13:32:07 +1300 |
| commit | a759883ae5045d213837039983ac521e8252ee9e (patch) | |
| tree | f60a34b7dc5560144ceb6dc461186bebd1dd34dd /Source/Core/DolphinWX/LogConfigWindow.cpp | |
| parent | 6425ddcbe7b533224adf204a7f1c968a73a470a7 (diff) | |
| parent | f84577b90b2b9ca9685f8e0b17c20af1d8e52343 (diff) | |
Merge pull request #3126 from phire/remove-logging-lock
Refactor logging code to get rid of a mutex.
Diffstat (limited to 'Source/Core/DolphinWX/LogConfigWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/LogConfigWindow.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp index e4bd1b9e8b..423804ecb8 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/LogConfigWindow.cpp @@ -170,9 +170,9 @@ void LogConfigWindow::OnWriteFileChecked(wxCommandEvent& event) if (m_checks->IsChecked(i)) { if (m_writeFile) - m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener()); + m_LogManager->AddListener((LogTypes::LOG_TYPE)i, LogListener::FILE_LISTENER); else - m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener()); + m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, LogListener::FILE_LISTENER); } } } @@ -185,9 +185,9 @@ void LogConfigWindow::OnWriteConsoleChecked(wxCommandEvent& event) if (m_checks->IsChecked(i)) { if (m_writeConsole) - m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener()); + m_LogManager->AddListener((LogTypes::LOG_TYPE)i, LogListener::CONSOLE_LISTENER); else - m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener()); + m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, LogListener::CONSOLE_LISTENER); } } } @@ -200,9 +200,9 @@ void LogConfigWindow::OnWriteWindowChecked(wxCommandEvent& event) if (m_checks->IsChecked(i)) { if (m_writeWindow) - m_LogManager->AddListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogWindow); + m_LogManager->AddListener((LogTypes::LOG_TYPE)i, LogListener::LOG_WINDOW_LISTENER); else - m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogWindow); + m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, LogListener::LOG_WINDOW_LISTENER); } } } @@ -226,17 +226,17 @@ void LogConfigWindow::ToggleLog(int _logType, bool enable) if (enable) { if (m_writeWindow) - m_LogManager->AddListener(logType, (LogListener *)m_LogWindow); + m_LogManager->AddListener(logType, LogListener::LOG_WINDOW_LISTENER); if (m_writeFile) - m_LogManager->AddListener(logType, m_LogManager->GetFileListener()); + m_LogManager->AddListener(logType, LogListener::FILE_LISTENER); if (m_writeConsole) - m_LogManager->AddListener(logType, m_LogManager->GetConsoleListener()); + m_LogManager->AddListener(logType, LogListener::CONSOLE_LISTENER); } else { - m_LogManager->RemoveListener(logType, (LogListener *)m_LogWindow); - m_LogManager->RemoveListener(logType, m_LogManager->GetFileListener()); - m_LogManager->RemoveListener(logType, m_LogManager->GetConsoleListener()); + m_LogManager->RemoveListener(logType, LogListener::LOG_WINDOW_LISTENER); + m_LogManager->RemoveListener(logType, LogListener::FILE_LISTENER); + m_LogManager->RemoveListener(logType, LogListener::CONSOLE_LISTENER); } } |