mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-27 14:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

use a more compact method to add and remove listeners t o all channels

Browse Source
This commit is contained in:
Peter Tissen 2014-06-27 09:22:00 +02:00
parent 1ad4380fab
commit ae472e9e67
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Utilities/Log.cpp
View File

@ -210,6 +210,20 @@ void LogManager::log(LogMessage msg)
#endif #endif
} }
void LogManager::addListener(std::shared_ptr<LogListener> listener)
{
for (auto& channel : mChannels)
{
channel.addListener(listener);
}
}
void LogManager::removeListener(std::shared_ptr<LogListener> listener)
{
for (auto& channel : mChannels)
{
channel.removeListener(listener);
}
}
LogManager& LogManager::getInstance() LogManager& LogManager::getInstance()
{ {

2
Utilities/Log.h
View File

@ -113,6 +113,8 @@ namespace Log
static LogManager& getInstance(); static LogManager& getInstance();
LogChannel& getChannel(LogType type); LogChannel& getChannel(LogType type);
void log(LogMessage msg); void log(LogMessage msg);
void addListener(std::shared_ptr<LogListener> listener);
void removeListener(std::shared_ptr<LogListener> listener);
#ifdef BUFFERED_LOGGING #ifdef BUFFERED_LOGGING
void consumeLog(); void consumeLog();
#endif #endif

18
rpcs3/Gui/ConLogFrame.cpp
View File

@ -139,14 +139,7 @@ LogFrame::LogFrame(wxWindow* parent)
m_tabs.AddPage(m_log, "Log"); m_tabs.AddPage(m_log, "Log");
m_tabs.AddPage(m_tty, "TTY"); m_tabs.AddPage(m_tty, "TTY");
Log::LogManager::getInstance().getChannel(Log::GENERAL).addListener(listener); Log::LogManager::getInstance().addListener(listener);
Log::LogManager::getInstance().getChannel(Log::LOADER).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::MEMORY).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::RSX).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::HLE).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::PPU).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::SPU).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::TTY).addListener(listener);
wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL);
s_main->Add(&m_tabs, 1, wxEXPAND); s_main->Add(&m_tabs, 1, wxEXPAND);
@ -158,14 +151,7 @@ LogFrame::LogFrame(wxWindow* parent)
LogFrame::~LogFrame() LogFrame::~LogFrame()
{ {
Log::LogManager::getInstance().getChannel(Log::GENERAL).removeListener(listener); Log::LogManager::getInstance().removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::LOADER).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::MEMORY).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::RSX).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::HLE).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::PPU).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::SPU).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::TTY).removeListener(listener);
} }
bool LogFrame::Close(bool force) bool LogFrame::Close(bool force)