Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[atv2] - deactivate screen resolution switching on atv2 for now (caus…

…e of the latest changes for iOS5.1 make this somewhat complicated). iOS allways leaves the rootLayer at 1280x720 - doesn't matter what resolution is set for the screen. So it automaticaly scales everything which is against XBMCs own scaling concepts.
  • Loading branch information...
commit d56465cef98d00bc279229c418399541fc96eadc 1 parent 21c10bd
@Memphiz Memphiz authored
View
6 xbmc/settings/GUISettings.cpp
@@ -370,11 +370,15 @@ void CGUISettings::Initialize()
// this setting would ideally not be saved, as its value is systematically derived from videoscreen.screenmode.
// contains a DISPLAYMODE
+#if !defined(TARGET_DARWIN_IOS_ATV2)
AddInt(vs, "videoscreen.screen", 240, 0, -1, 1, g_Windowing.GetNumScreens(), SPIN_CONTROL_TEXT);
+#endif
// this setting would ideally not be saved, as its value is systematically derived from videoscreen.screenmode.
// contains an index to the g_settings.m_ResInfo array. the only meaningful fields are iScreen, iWidth, iHeight.
#if defined (__APPLE__)
- AddInt(vs, "videoscreen.resolution", 131, -1, 0, 1, INT_MAX, SPIN_CONTROL_TEXT);
+ #if !defined(TARGET_DARWIN_IOS_ATV2)
+ AddInt(vs, "videoscreen.resolution", 131, -1, 0, 1, INT_MAX, SPIN_CONTROL_TEXT);
+ #endif
#else
AddInt(vs, "videoscreen.resolution", 169, -1, 0, 1, INT_MAX, SPIN_CONTROL_TEXT);
#endif
View
7 xbmc/windowing/osx/WinSystemIOS.mm
@@ -112,8 +112,9 @@
m_bFullScreen = fullScreen;
CLog::Log(LOGDEBUG, "About to switch to %i x %i on screen %i",m_nWidth, m_nHeight, res.iScreen);
+#ifndef TARGET_DARWIN_IOS_ATV2
SwitchToVideoMode(res.iWidth, res.iHeight, res.fRefreshRate, res.iScreen);
-
+#endif//TARGET_DARWIN_IOS_ATV2
CRenderSystemGLES::ResetRenderSystem(res.iWidth, res.iHeight, fullScreen, res.fRefreshRate);
return true;
@@ -206,7 +207,8 @@
{
UpdateDesktopResolution(g_settings.m_ResInfo[RES_DESKTOP], 0, w, h, fps);
}
-
+
+#ifndef TARGET_DARWIN_IOS_ATV2
//see resolution.h enum RESOLUTION for how the resolutions
//have to appear in the g_settings.m_ResInfo vector
//add the desktop resolutions of the other screens
@@ -224,6 +226,7 @@
//now just fill in the possible reolutions for the attached screens
//and push to the m_ResInfo vector
FillInVideoModes();
+#endif //TARGET_DARWIN_IOS_ATV2
}
void CWinSystemIOS::FillInVideoModes()
Please sign in to comment.
Something went wrong with that request. Please try again.