diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-01-25 12:52:20 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-01-25 12:52:20 +0000 |
| commit | 81aebe5e9642fccccd6ed712d80d29ae2d0ddcee (patch) | |
| tree | cd13a4b5bd3c2c59aaa66ba9a5a5d309a5b1b271 /Source/Core | |
| parent | d2044a7a237f6d57c75893f7c7d3f5dc29b239d1 (diff) | |
Fix the nogui build. Don't show the Xrandr logs in release builds. Fix flickering in fullscreen when using the auto window size option and not rendering to main.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6914 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/MainNoGUI.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/X11Utils.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index d080121284..bb6614f85c 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -682,7 +682,7 @@ void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height) void CFrame::OnRenderWindowSizeRequest(int width, int height) { if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize || - IsFullScreen() || m_RenderFrame->IsMaximized()) + RendererIsFullscreen() || m_RenderFrame->IsMaximized()) return; int old_width, old_height; diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp index 5b5a0a2503..798f6027f7 100644 --- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp @@ -88,7 +88,7 @@ void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height) height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight; } -void Host_RequestRenderWindowSize(int& width, int& height) {} +void Host_RequestRenderWindowSize(int width, int height) {} bool Host_RendererHasFocus() { diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp index 8db7265bfb..237a7ca956 100644 --- a/Source/Core/DolphinWX/Src/X11Utils.cpp +++ b/Source/Core/DolphinWX/Src/X11Utils.cpp @@ -168,14 +168,14 @@ XRRConfiguration::XRRConfiguration(Display *_dpy, Window _win) sizes = XRRSizes(dpy, DefaultScreen(dpy), &numSizes); if (!numSizes) { - NOTICE_LOG(VIDEO, "XRRExtension not supported."); + WARN_LOG(VIDEO, "XRRExtension not supported."); bValid = false; return; } int vidModeMajorVersion, vidModeMinorVersion; XRRQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion); - NOTICE_LOG(VIDEO, "XRRExtension-Version %d.%d", vidModeMajorVersion, vidModeMinorVersion); + INFO_LOG(VIDEO, "XRRExtension-Version %d.%d", vidModeMajorVersion, vidModeMinorVersion); Update(); } @@ -203,12 +203,12 @@ void XRRConfiguration::Update() screenConfig = XRRGetScreenInfo(dpy, win); - /* save desktop resolution */ + // Save desktop resolution deskSize = XRRConfigCurrentConfiguration(screenConfig, &screenRotation); - /* Set the desktop resolution as the default */ + // Set the desktop resolution as the default fullSize = deskSize; - /* Find the index of the fullscreen resolution from config */ + // Find the index of the fullscreen resolution from config sizes = XRRConfigSizes(screenConfig, &numSizes); if (numSizes > 0 && sizes != NULL) { for (int i = 0; i < numSizes; i++) { @@ -216,7 +216,7 @@ void XRRConfiguration::Update() fullSize = i; } } - NOTICE_LOG(VIDEO, "Fullscreen Resolution %dx%d", + INFO_LOG(VIDEO, "Fullscreen Resolution %dx%d", sizes[fullSize].width, sizes[fullSize].height); } else { |