Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make Enable Debug Logging checkbox instant as it was intended to be.

Browse source
This commit is contained in:
The Dax 2013-10-13 14:14:28 -04:00
parent 5b127af679
commit 9c868351de
7 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/Host.h
View file

@ -48,6 +48,7 @@ public:
virtual void GoFullscreen(bool) {}
virtual void ShutdownSound() = 0;
virtual void PollControllers(InputState &input_state) {}
virtual void ShowDebugConsole(bool) {}
//this is sent from EMU thread! Make sure that Host handles it properly!
virtual void BootDone() {}

15
UI/GameSettingsScreen.cpp
View file

@ -42,9 +42,6 @@
#ifdef _WIN32
namespace MainWindow {
enum {
WM_USER_LOG_STATUS_CHANGED = WM_USER + 101,
};
extern HWND hwndMain;
}
#endif
@ -479,8 +476,6 @@ void DeveloperToolsScreen::CreateViews() {
using namespace UI;
root_ = new ScrollView(ORIENT_VERTICAL);
enableLogging_ = g_Config.bEnableLogging;
I18NCategory *d = GetI18NCategory("Dialog");
I18NCategory *de = GetI18NCategory("Developer");
I18NCategory *gs = GetI18NCategory("Graphics");
@ -498,7 +493,7 @@ void DeveloperToolsScreen::CreateViews() {
if (!File::Exists(g_Config.memCardDirectory + "pspautotests/tests/"))
cpuTests->SetEnabled(false);
list->Add(new CheckBox(&enableLogging_, de->T("Enable Logging")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoggingChanged);
list->Add(new CheckBox(&g_Config.bEnableLogging, de->T("Enable Logging")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoggingChanged);
list->Add(new Choice(de->T("Logging Channels")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLogConfig);
list->Add(new ItemHeader(de->T("Language")));
list->Add(new Choice(de->T("Load language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoadLanguageIni);
@ -515,10 +510,6 @@ void DeveloperToolsScreen::sendMessage(const char *message, const char *value){
UI::EventReturn DeveloperToolsScreen::OnBack(UI::EventParams &e) {
screenManager()->finishDialog(this, DR_OK);
g_Config.bEnableLogging = enableLogging_;
#ifdef _WIN32
PostMessage(MainWindow::hwndMain, MainWindow::WM_USER_LOG_STATUS_CHANGED, 0, 0);
#endif
g_Config.Save();
return UI::EVENT_DONE;
@ -542,9 +533,7 @@ UI::EventReturn GameSettingsScreen::OnRestoreDefaultSettings(UI::EventParams &e)
}
UI::EventReturn DeveloperToolsScreen::OnLoggingChanged(UI::EventParams &e) {
#ifdef _WIN32
PostMessage(MainWindow::hwndMain, MainWindow::WM_USER_LOG_STATUS_CHANGED, 0, 0);
#endif
host->ShowDebugConsole(g_Config.bEnableLogging);
return UI::EVENT_DONE;
}

3
UI/GameSettingsScreen.h
View file

@ -102,7 +102,4 @@ private:
UI::EventReturn OnLoadLanguageIni(UI::EventParams &e);
UI::EventReturn OnSaveLanguageIni(UI::EventParams &e);
UI::EventReturn OnLogConfig(UI::EventParams &e);
// Temporary variable.
bool enableLogging_;
};

6
Windows/WindowsHost.cpp
View file

@ -169,8 +169,6 @@ void WindowsHost::SetDebugMode(bool mode)
}
}
extern BOOL g_bFullScreen;
void WindowsHost::PollControllers(InputState &input_state)
{
bool doPad = true;
@ -376,3 +374,7 @@ void WindowsHost::GoFullscreen(bool viewFullscreen) {
else
MainWindow::_ViewNormal(MainWindow::GetHWND());
}
void WindowsHost::ShowDebugConsole(bool showConsole) {
MainWindow::ShowDebugConsole(showConsole);
}

1
Windows/WindowsHost.h
View file

@ -62,6 +62,7 @@ public:
virtual void GPUNotifyDraw();
virtual void GPUNotifyTextureAttachment(u32 addr);
virtual bool GPUAllowTextureCache(u32 addr);
virtual void ShowDebugConsole(bool);
virtual bool CanCreateShortcut() {return false;} // Turn on when fixed
virtual bool CreateDesktopShortcut(std::string argumentPath, std::string title);

21
Windows/WndMainWindow.cpp
View file

@ -1588,16 +1588,6 @@ namespace MainWindow
SetCursor(LoadCursor(0, IDC_ARROW));
break;
case WM_USER_LOG_STATUS_CHANGED:
if(!g_Config.bEnableLogging) {
LogManager::GetInstance()->GetConsoleListener()->Show(false);
EnableMenuItem(menu, ID_DEBUG_LOG, MF_GRAYED);
} else {
LogManager::GetInstance()->GetConsoleListener()->Show(true);
EnableMenuItem(menu, ID_DEBUG_LOG, MF_ENABLED);
}
break;
case WM_USER_UPDATE_UI:
TranslateMenus();
Update();
@ -1863,4 +1853,15 @@ namespace MainWindow
HINSTANCE GetHInstance() {
return hInst;
}
void ShowDebugConsole(bool) {
if (!g_Config.bEnableLogging) {
LogManager::GetInstance()->GetConsoleListener()->Show(false);
EnableMenuItem(menu, ID_DEBUG_LOG, MF_GRAYED);
}
else {
LogManager::GetInstance()->GetConsoleListener()->Show(true);
EnableMenuItem(menu, ID_DEBUG_LOG, MF_ENABLED);
}
}
}

8
Windows/WndMainWindow.h
View file

@ -9,10 +9,9 @@ namespace MainWindow
{
enum {
WM_USER_SAVESTATE_FINISH = WM_USER + 100,
WM_USER_LOG_STATUS_CHANGED = WM_USER + 101,
WM_USER_UPDATE_UI = WM_USER + 102,
WM_USER_UPDATE_SCREEN = WM_USER + 103,
WM_USER_WINDOW_TITLE_CHANGED = WM_USER + 104,
WM_USER_UPDATE_UI = WM_USER + 101,
WM_USER_UPDATE_SCREEN = WM_USER + 102,
WM_USER_WINDOW_TITLE_CHANGED = WM_USER + 103,
};
enum {
@ -65,6 +64,7 @@ namespace MainWindow
void SaveStateActionFinished(bool result, void *userdata);
void _ViewFullScreen(HWND hWnd);
void _ViewNormal(HWND hWnd);
void ShowDebugConsole(bool);
void TranslateMenus();
void setTexScalingMultiplier(int level);
}