diff options
| -rw-r--r-- | xbmc/Application.cpp | 16 | ||||
| -rw-r--r-- | xbmc/interfaces/legacy/ModuleXbmcgui.cpp | 4 | ||||
| -rw-r--r-- | xbmc/interfaces/legacy/ModuleXbmcgui.h | 13 |
3 files changed, 19 insertions, 14 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index a891be6a39..bc6f4a2a08 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -815,6 +815,8 @@ bool CApplication::CreateGUI() bool CApplication::InitWindow() { + RESOLUTION res = CDisplaySettings::Get().GetCurrentResolution(); + #ifdef TARGET_DARWIN_OSX // force initial window creation to be windowed, if fullscreen, it will switch to it below // fixes the white screen of death if starting fullscreen and switching to windowed. @@ -824,6 +826,18 @@ bool CApplication::InitWindow() CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window"); return false; } +#elif defined(TARGET_ANDROID) + // We might come from a refresh rate switch destroying the native window; use the renderer resolution + if (g_graphicsContext.GetVideoResolution() != RES_INVALID) + res = g_graphicsContext.GetVideoResolution(); + RESOLUTION_INFO res_info = CDisplaySettings::Get().GetResolutionInfo(res); + + bool bFullScreen = res != RES_WINDOW; + if (!g_Windowing.CreateNewWindow(CSysInfo::GetAppName(), bFullScreen, res_info, OnEvent)) + { + CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window"); + return false; + } #else bool bFullScreen = CDisplaySettings::Get().GetCurrentResolution() != RES_WINDOW; if (!g_Windowing.CreateNewWindow(CSysInfo::GetAppName(), bFullScreen, CDisplaySettings::Get().GetCurrentResolutionInfo(), OnEvent)) @@ -839,7 +853,7 @@ bool CApplication::InitWindow() return false; } // set GUI res and force the clear of the screen - g_graphicsContext.SetVideoResolution(CDisplaySettings::Get().GetCurrentResolution()); + g_graphicsContext.SetVideoResolution(res); return true; } diff --git a/xbmc/interfaces/legacy/ModuleXbmcgui.cpp b/xbmc/interfaces/legacy/ModuleXbmcgui.cpp index 71a80c8297..e21bc11cb9 100644 --- a/xbmc/interfaces/legacy/ModuleXbmcgui.cpp +++ b/xbmc/interfaces/legacy/ModuleXbmcgui.cpp @@ -34,12 +34,12 @@ namespace XBMCAddon { void lock() { - CLog::Log(LOGWARNING,"'xbmcgui.lock()' is depreciated and serves no purpose anymore, it will be removed in future releases"); + CLog::Log(LOGWARNING,"'xbmcgui.lock()' is deprecated and serves no purpose anymore, it will be removed in future releases"); } void unlock() { - CLog::Log(LOGWARNING,"'xbmcgui.unlock()' is depreciated and serves no purpose anymore, it will be removed in future releases"); + CLog::Log(LOGWARNING,"'xbmcgui.unlock()' is deprecated and serves no purpose anymore, it will be removed in future releases"); } long getCurrentWindowId() diff --git a/xbmc/interfaces/legacy/ModuleXbmcgui.h b/xbmc/interfaces/legacy/ModuleXbmcgui.h index dc3c73f1aa..8f6ffa9d5d 100644 --- a/xbmc/interfaces/legacy/ModuleXbmcgui.h +++ b/xbmc/interfaces/legacy/ModuleXbmcgui.h @@ -25,21 +25,12 @@ namespace XBMCAddon namespace xbmcgui { /** - * lock() -- Lock the gui until xbmcgui.unlock() is called.\n - * \n - * *Note, This will improve performance when doing a lot of gui manipulation at once.\n - * The main program (xbmc itself) will freeze until xbmcgui.unlock() is called.\n - * - * example: - * - xbmcgui.lock() + * lock() -- deprecated and serves no purpose anymore. */ void lock(); /** - * unlock() -- Unlock the gui from a lock() call. - * - * example: - * - xbmcgui.unlock() + * unlock() -- deprecated and serves no purpose anymore. */ void unlock(); |