diff options
26 files changed, 29 insertions, 188 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index 2153e2a389..246a0ab11b 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -5690,12 +5690,7 @@ msgctxt "#13101" msgid "Let driver choose (requires restart)" msgstr "" -#empty strings from id 13102 to 13104 - -#: system/settings/settings.xml -msgctxt "#13105" -msgid "Vertical blank sync" -msgstr "" +#empty strings from id 13102 to 13105 #: xbmc/peripherals/bus/PeripheralBus.cpp #: system/settings/settings.xml @@ -17344,11 +17339,7 @@ msgctxt "#36355" msgid "In a multi-screen configuration, the screens not displaying this application are blacked out." msgstr "" -#. Description of setting "System -> Video output -> Vertical blank sync" with label #13105 -#: system/settings/settings.xml -msgctxt "#36356" -msgid "Eliminates tearing." -msgstr "" +#empty strings from id 36356 to 36356 #. Description of setting "System -> Video output -> Video calibration..." with label #214 #: system/settings/settings.xml diff --git a/system/settings/freebsd.xml b/system/settings/freebsd.xml index 3e5915e917..b6c463507d 100644 --- a/system/settings/freebsd.xml +++ b/system/settings/freebsd.xml @@ -1,12 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<settings> - <section id="system"> - <category id="videoscreen"> - <group id="3"> - <setting id="videoscreen.vsync"> - <default>3</default> <!-- VSYNC_DRIVER --> - </setting> - </group> - </category> - </section> -</settings> + diff --git a/system/settings/imx6.xml b/system/settings/imx6.xml index d8b17c3bb9..a5f434d62e 100644 --- a/system/settings/imx6.xml +++ b/system/settings/imx6.xml @@ -7,11 +7,6 @@ <visible>false</visible> </setting> </group> - <group id="3"> - <setting id="videoscreen.vsync"> - <default>3</default> <!-- VSYNC_DRIVER --> - </setting> - </group> </category> </section> <section id="videos"> diff --git a/system/settings/linux.xml b/system/settings/linux.xml index edacb730be..fd8867ebc3 100644 --- a/system/settings/linux.xml +++ b/system/settings/linux.xml @@ -7,11 +7,6 @@ <visible>false</visible> </setting> </group> - <group id="3"> - <setting id="videoscreen.vsync"> - <default>3</default> <!-- VSYNC_DRIVER --> - </setting> - </group> </category> </section> </settings> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index d304e511e8..841be6ea9c 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2399,17 +2399,6 @@ </setting> </group> <group id="3"> - <setting id="videoscreen.vsync" type="integer" label="13105" help="36356"> - <level>2</level> - <default>2</default> <!-- VSYNC_ALWAYS --> - <constraints> - <options>verticalsyncs</options> - </constraints> - <updates> - <update type="change" /> - </updates> - <control type="list" format="string" /> - </setting> <setting id="videoscreen.guicalibration" type="action" label="214" help="36357"> <level>1</level> <control type="button" format="action" /> diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index d91feb975b..e34189fba6 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -299,7 +299,6 @@ CApplication::CApplication(void) m_threadID = 0; m_progressTrackingPlayCountUpdate = false; m_currentStackPosition = 0; - m_lastFrameTime = 0; m_lastRenderTime = 0; m_skipGuiRender = false; m_bTestMode = false; @@ -684,8 +683,7 @@ bool CApplication::Create() g_mediaManager.Initialize(); - m_lastFrameTime = XbmcThreads::SystemClockMillis(); - m_lastRenderTime = m_lastFrameTime; + m_lastRenderTime = XbmcThreads::SystemClockMillis(); return true; } @@ -1836,68 +1834,15 @@ void CApplication::Render() if (m_bStop) return; - MEASURE_FUNCTION; - - int vsync_mode = CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOSCREEN_VSYNC); - bool hasRendered = false; - bool limitFrames = false; - bool bPresentFrame = false; - unsigned int singleFrameTime = 40; // default limit 25 fps // Whether externalplayer is playing and we're unfocused bool extPlayerActive = m_pPlayer->IsExternalPlaying() && !m_AppFocused; + if (!extPlayerActive && g_graphicsContext.IsFullScreenVideo() && !m_pPlayer->IsPausedPlayback()) { - // Less fps in DPMS - bool lowfps = g_Windowing.EnableFrameLimiter(); - - if (!extPlayerActive && g_graphicsContext.IsFullScreenVideo() && !m_pPlayer->IsPausedPlayback()) - { - bPresentFrame = true; - } - else - { - // engage the frame limiter as needed - limitFrames = lowfps || extPlayerActive; - - // TODO: - // remove those useless modes, they don't do any good - if (vsync_mode == VSYNC_DISABLED || vsync_mode == VSYNC_VIDEO) - { - limitFrames = true; // not using vsync. - singleFrameTime = 10; - } - else if ((g_infoManager.GetFPS() > g_graphicsContext.GetFPS() + 10) && g_infoManager.GetFPS() > 100) - { - limitFrames = true; // using vsync, but it isn't working. - } - - if (limitFrames) - { - if (extPlayerActive) - { - ResetScreenSaver(); // Prevent screensaver dimming the screen - singleFrameTime = 1000; // 1 fps, high wakeup latency but v.low CPU usage - } - else if (lowfps) - singleFrameTime = 200; // 5 fps, <=200 ms latency to wake up - } - - } - } - - if (g_graphicsContext.IsFullScreenVideo() && m_pPlayer->IsPlaying() && vsync_mode == VSYNC_VIDEO) - g_Windowing.SetVSync(true); - else if (vsync_mode == VSYNC_ALWAYS) - g_Windowing.SetVSync(true); - else if (vsync_mode != VSYNC_DRIVER) - { - g_Windowing.SetVSync(false); - } - - if (bPresentFrame && m_pPlayer->IsPlaying() && !m_pPlayer->IsPaused()) ResetScreenSaver(); + } if(!g_Windowing.BeginRender()) return; @@ -1938,7 +1883,6 @@ void CApplication::Render() // isn't called) g_infoManager.ResetCache(); - unsigned int now = XbmcThreads::SystemClockMillis(); if (hasRendered) { @@ -1946,32 +1890,16 @@ void CApplication::Render() m_lastRenderTime = now; } - if (!extPlayerActive && g_graphicsContext.IsFullScreenVideo() && !m_pPlayer->IsPausedPlayback()) - { - g_Windowing.FinishPipeline(); - } m_pPlayer->AfterRender(); - //when nothing has been rendered for m_guiDirtyRegionNoFlipTimeout milliseconds, - //we don't call g_graphicsContext.Flip() anymore, this saves gpu and cpu usage - bool flip; - if (g_advancedSettings.m_guiDirtyRegionNoFlipTimeout >= 0) - flip = hasRendered || (now - m_lastRenderTime) < (unsigned int)g_advancedSettings.m_guiDirtyRegionNoFlipTimeout; - else - flip = true; - - //fps limiter, make sure each frame lasts at least singleFrameTime milliseconds - if (limitFrames || !(flip || bPresentFrame)) + if (g_graphicsContext.IsFullScreenVideo()) { - unsigned int frameTime = now - m_lastFrameTime; - if (frameTime < singleFrameTime) - Sleep(singleFrameTime - frameTime); + g_Windowing.FinishPipeline(); } - g_graphicsContext.Flip(flip); + g_graphicsContext.Flip(hasRendered); - m_lastFrameTime = XbmcThreads::SystemClockMillis(); - CTimeUtils::UpdateFrameTime(flip); + CTimeUtils::UpdateFrameTime(hasRendered); } void CApplication::SetStandAlone(bool value) diff --git a/xbmc/Application.h b/xbmc/Application.h index 74bcd1a714..609437287a 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -463,7 +463,6 @@ protected: int m_currentStackPosition; int m_nextPlaylistItem; - unsigned int m_lastFrameTime; unsigned int m_lastRenderTime; bool m_skipGuiRender; diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp index cc9f667b01..d930502a02 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp @@ -918,14 +918,9 @@ float CRenderManager::GetMaximumFPS() { float fps; - if (CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOSCREEN_VSYNC) != VSYNC_DISABLED) - { - fps = (float)g_VideoReferenceClock.GetRefreshRate(); - if (fps <= 0) - fps = g_graphicsContext.GetFPS(); - } - else - fps = 1000.0f; + fps = (float)g_VideoReferenceClock.GetRefreshRate(); + if (fps <= 0) + fps = g_graphicsContext.GetFPS(); return fps; } diff --git a/xbmc/guilib/Resolution.h b/xbmc/guilib/Resolution.h index 02c589c056..f571528a78 100644 --- a/xbmc/guilib/Resolution.h +++ b/xbmc/guilib/Resolution.h @@ -56,13 +56,6 @@ enum RESOLUTION { // 12 + N + ... // Other resolutions, in any order }; -enum VSYNC { - VSYNC_DISABLED = 0, - VSYNC_VIDEO = 1, - VSYNC_ALWAYS = 2, - VSYNC_DRIVER = 3 -}; - struct OVERSCAN { int left; diff --git a/xbmc/rendering/RenderSystem.h b/xbmc/rendering/RenderSystem.h index 159ad5d74f..c4352e7cbd 100644 --- a/xbmc/rendering/RenderSystem.h +++ b/xbmc/rendering/RenderSystem.h @@ -106,8 +106,6 @@ public: virtual bool ClearBuffers(color_t color) = 0; virtual bool IsExtSupported(const char* extension) = 0; - virtual void SetVSync(bool vsync) = 0; - bool GetVSync() { return m_bVSync; } virtual void FinishPipeline() {}; virtual void SetViewPort(CRect& viewPort) = 0; diff --git a/xbmc/rendering/gl/RenderSystemGL.cpp b/xbmc/rendering/gl/RenderSystemGL.cpp index 4ae5664976..87ff90036c 100644 --- a/xbmc/rendering/gl/RenderSystemGL.cpp +++ b/xbmc/rendering/gl/RenderSystemGL.cpp @@ -292,11 +292,16 @@ bool CRenderSystemGL::IsExtSupported(const char* extension) void CRenderSystemGL::PresentRender(bool rendered) { + SetVSync(true); + if (!m_bRenderCreated) return; PresentRenderImpl(rendered); m_latencyCounter++; + + if (!rendered) + Sleep(40); } void CRenderSystemGL::SetVSync(bool enable) diff --git a/xbmc/rendering/gl/RenderSystemGL.h b/xbmc/rendering/gl/RenderSystemGL.h index 02f95f528f..d6fe28bfcd 100644 --- a/xbmc/rendering/gl/RenderSystemGL.h +++ b/xbmc/rendering/gl/RenderSystemGL.h @@ -43,7 +43,7 @@ public: bool ClearBuffers(color_t color) override; bool IsExtSupported(const char* extension) override; - void SetVSync(bool vsync) override; + void SetVSync(bool vsync); void ResetVSync() { m_bVsyncInit = false; } void FinishPipeline() override; diff --git a/xbmc/rendering/gles/RenderSystemGLES.cpp b/xbmc/rendering/gles/RenderSystemGLES.cpp index e764b01ffd..aa3becc4ed 100644 --- a/xbmc/rendering/gles/RenderSystemGLES.cpp +++ b/xbmc/rendering/gles/RenderSystemGLES.cpp @@ -276,10 +276,15 @@ static int64_t abs64(int64_t a) void CRenderSystemGLES::PresentRender(bool rendered) { + SetVSync(true); + if (!m_bRenderCreated) return; PresentRenderImpl(rendered); + + if (!rendered) + Sleep(40); } void CRenderSystemGLES::SetVSync(bool enable) diff --git a/xbmc/rendering/gles/RenderSystemGLES.h b/xbmc/rendering/gles/RenderSystemGLES.h index f2c0765bc9..989a43f7ee 100644 --- a/xbmc/rendering/gles/RenderSystemGLES.h +++ b/xbmc/rendering/gles/RenderSystemGLES.h @@ -60,7 +60,7 @@ public: bool ClearBuffers(color_t color) override; bool IsExtSupported(const char* extension) override; - void SetVSync(bool vsync) override; + void SetVSync(bool vsync); void ResetVSync() { m_bVsyncInit = false; } void SetViewPort(CRect& viewPort) override; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 2adc1f580e..b82ed2c141 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -374,7 +374,6 @@ void CAdvancedSettings::Initialize() #endif m_guiVisualizeDirtyRegions = false; m_guiAlgorithmDirtyRegions = 3; - m_guiDirtyRegionNoFlipTimeout = 0; m_airTunesPort = 36666; m_airPlayPort = 36667; @@ -1116,7 +1115,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) { XMLUtils::GetBoolean(pElement, "visualizedirtyregions", m_guiVisualizeDirtyRegions); XMLUtils::GetInt(pElement, "algorithmdirtyregions", m_guiAlgorithmDirtyRegions); - XMLUtils::GetInt(pElement, "nofliptimeout", m_guiDirtyRegionNoFlipTimeout); } std::string seekSteps; diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index ae05f9bbc0..a740421b6c 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -333,7 +333,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler bool m_guiVisualizeDirtyRegions; int m_guiAlgorithmDirtyRegions; - int m_guiDirtyRegionNoFlipTimeout; unsigned int m_addonPackageFolderSize; unsigned int m_cacheMemBufferSize; diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp index 7993a732c2..c5ba807f89 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp @@ -323,16 +323,6 @@ bool CDisplaySettings::OnSettingUpdate(CSetting* &setting, const char *oldSettin if (screenmode.size() == 21) return screenmodeSetting->SetValue(screenmode + "std"); } - else if (settingId == CSettings::SETTING_VIDEOSCREEN_VSYNC) - { - // This ifdef is intended to catch everything except Linux and FreeBSD -#if !defined(TARGET_LINUX) || defined(TARGET_DARWIN) || defined(TARGET_ANDROID) || defined(TARGET_RASPBERRY_PI) - // in the Gotham alphas through beta3 the default value for darwin and android was set incorrectly. - CSettingInt *vsyncSetting = (CSettingInt*)setting; - if (vsyncSetting->GetValue() == VSYNC_DRIVER) - return vsyncSetting->SetValue(VSYNC_ALWAYS); -#endif - } else if (settingId == CSettings::SETTING_VIDEOSCREEN_PREFEREDSTEREOSCOPICMODE) { CSettingInt *stereomodeSetting = (CSettingInt*)setting; @@ -728,17 +718,6 @@ void CDisplaySettings::SettingOptionsScreensFiller(const CSetting *setting, std: #endif } -void CDisplaySettings::SettingOptionsVerticalSyncsFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data) -{ - // This ifdef is intended to catch everything except Linux and FreeBSD -#if defined(TARGET_LINUX) && !defined(TARGET_DARWIN) && !defined(TARGET_ANDROID) && !defined(TARGET_RASPBERRY_PI) - list.push_back(std::make_pair(g_localizeStrings.Get(13101), VSYNC_DRIVER)); -#endif - list.push_back(std::make_pair(g_localizeStrings.Get(13106), VSYNC_DISABLED)); - list.push_back(std::make_pair(g_localizeStrings.Get(13107), VSYNC_VIDEO)); - list.push_back(std::make_pair(g_localizeStrings.Get(13108), VSYNC_ALWAYS)); -} - void CDisplaySettings::SettingOptionsStereoscopicModesFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data) { for (int i = RENDER_STEREO_MODE_OFF; i < RENDER_STEREO_MODE_COUNT; i++) diff --git a/xbmc/settings/DisplaySettings.h b/xbmc/settings/DisplaySettings.h index 8402340f4c..729bd94386 100644 --- a/xbmc/settings/DisplaySettings.h +++ b/xbmc/settings/DisplaySettings.h @@ -94,7 +94,6 @@ public: static void SettingOptionsRefreshRatesFiller(const CSetting *setting, std::vector< std::pair<std::string, std::string> > &list, std::string ¤t, void *data); static void SettingOptionsResolutionsFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data); static void SettingOptionsScreensFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data); - static void SettingOptionsVerticalSyncsFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data); static void SettingOptionsStereoscopicModesFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data); static void SettingOptionsPreferredStereoscopicViewModesFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int ¤t, void *data); static void SettingOptionsMonitorsFiller(const CSetting *setting, std::vector< std::pair<std::string, std::string> > &list, std::string ¤t, void *data); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index d3254f2938..a2a97e43e6 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -338,7 +338,6 @@ const std::string CSettings::SETTING_VIDEOSCREEN_FAKEFULLSCREEN = "videoscreen.f const std::string CSettings::SETTING_VIDEOSCREEN_BLANKDISPLAYS = "videoscreen.blankdisplays"; const std::string CSettings::SETTING_VIDEOSCREEN_STEREOSCOPICMODE = "videoscreen.stereoscopicmode"; const std::string CSettings::SETTING_VIDEOSCREEN_PREFEREDSTEREOSCOPICMODE = "videoscreen.preferedstereoscopicmode"; -const std::string CSettings::SETTING_VIDEOSCREEN_VSYNC = "videoscreen.vsync"; const std::string CSettings::SETTING_VIDEOSCREEN_GUICALIBRATION = "videoscreen.guicalibration"; const std::string CSettings::SETTING_VIDEOSCREEN_TESTPATTERN = "videoscreen.testpattern"; const std::string CSettings::SETTING_VIDEOSCREEN_LIMITEDRANGE = "videoscreen.limitedrange"; @@ -942,7 +941,6 @@ void CSettings::InitializeOptionFillers() m_settingsManager->RegisterSettingOptionsFiller("timezonecountries", CLinuxTimezone::SettingOptionsTimezoneCountriesFiller); m_settingsManager->RegisterSettingOptionsFiller("timezones", CLinuxTimezone::SettingOptionsTimezonesFiller); #endif - m_settingsManager->RegisterSettingOptionsFiller("verticalsyncs", CDisplaySettings::SettingOptionsVerticalSyncsFiller); m_settingsManager->RegisterSettingOptionsFiller("keyboardlayouts", CKeyboardLayoutManager::SettingOptionsKeyboardLayoutsFiller); m_settingsManager->RegisterSettingOptionsFiller("loggingcomponents", CAdvancedSettings::SettingOptionsLoggingComponentsFiller); m_settingsManager->RegisterSettingOptionsFiller("pvrrecordmargins", PVR::CPVRSettings::MarginTimeFiller); @@ -1025,7 +1023,6 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert(CSettings::SETTING_VIDEOSCREEN_SCREEN); settingSet.insert(CSettings::SETTING_VIDEOSCREEN_RESOLUTION); settingSet.insert(CSettings::SETTING_VIDEOSCREEN_SCREENMODE); - settingSet.insert(CSettings::SETTING_VIDEOSCREEN_VSYNC); settingSet.insert(CSettings::SETTING_VIDEOSCREEN_MONITOR); settingSet.insert(CSettings::SETTING_VIDEOSCREEN_PREFEREDSTEREOSCOPICMODE); m_settingsManager->RegisterCallback(&CDisplaySettings::GetInstance(), settingSet); diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h index 27a69b3954..993c6d9775 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h @@ -296,7 +296,6 @@ public: static const std::string SETTING_VIDEOSCREEN_BLANKDISPLAYS; static const std::string SETTING_VIDEOSCREEN_STEREOSCOPICMODE; static const std::string SETTING_VIDEOSCREEN_PREFEREDSTEREOSCOPICMODE; - static const std::string SETTING_VIDEOSCREEN_VSYNC; static const std::string SETTING_VIDEOSCREEN_GUICALIBRATION; static const std::string SETTING_VIDEOSCREEN_TESTPATTERN; static const std::string SETTING_VIDEOSCREEN_LIMITEDRANGE; diff --git a/xbmc/windowing/WinSystem.h b/xbmc/windowing/WinSystem.h index b92215613e..e108b5c980 100644 --- a/xbmc/windowing/WinSystem.h +++ b/xbmc/windowing/WinSystem.h @@ -89,7 +89,6 @@ public: virtual void EnableSystemScreenSaver(bool bEnable) {}; virtual bool IsSystemScreenSaverEnabled() {return false;} virtual void ResetOSScreensaver() {}; - virtual bool EnableFrameLimiter() {return false;}; // resolution interfaces unsigned int GetWidth() { return m_nWidth; } diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp index 7b091c3409..ee85585e08 100644 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp @@ -655,11 +655,6 @@ int CWinSystemX11::XErrorHandler(Display* dpy, XErrorEvent* error) return 0; } -bool CWinSystemX11::EnableFrameLimiter() -{ - return m_minimized; -} - bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std::string &output, int *winstate) { bool changeWindow = false; diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h index 297dc88309..a263fc5a27 100644 --- a/xbmc/windowing/X11/WinSystemX11.h +++ b/xbmc/windowing/X11/WinSystemX11.h @@ -48,7 +48,6 @@ public: int GetCurrentScreen() override { return m_nScreen; } void ShowOSMouse(bool show) override; void ResetOSScreensaver() override; - bool EnableFrameLimiter() override; void EnableSystemScreenSaver(bool bEnable) override; void NotifyAppActiveChange(bool bActivated) override; diff --git a/xbmc/windowing/osx/WinSystemOSX.h b/xbmc/windowing/osx/WinSystemOSX.h index 23d851a322..dbc9245436 100644 --- a/xbmc/windowing/osx/WinSystemOSX.h +++ b/xbmc/windowing/osx/WinSystemOSX.h @@ -61,7 +61,6 @@ public: virtual void EnableSystemScreenSaver(bool bEnable); virtual bool IsSystemScreenSaverEnabled(); virtual void ResetOSScreensaver(); - virtual bool EnableFrameLimiter(); virtual void EnableTextInput(bool bEnable); virtual bool IsTextInputEnabled(); diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm index f3778ae2de..cf0392bf07 100644 --- a/xbmc/windowing/osx/WinSystemOSX.mm +++ b/xbmc/windowing/osx/WinSystemOSX.mm @@ -1609,11 +1609,6 @@ void CWinSystemOSX::ResetOSScreensaver() EnableSystemScreenSaver(!m_bFullScreen); } -bool CWinSystemOSX::EnableFrameLimiter() -{ - return IsObscured(); -} - void CWinSystemOSX::EnableTextInput(bool bEnable) { if (bEnable) diff --git a/xbmc/windowing/osx/WinSystemOSXGL.h b/xbmc/windowing/osx/WinSystemOSXGL.h index be560e81c0..de5736eb2d 100644 --- a/xbmc/windowing/osx/WinSystemOSXGL.h +++ b/xbmc/windowing/osx/WinSystemOSXGL.h @@ -32,12 +32,12 @@ class CWinSystemOSXGL : public CWinSystemOSX, public CRenderSystemGL public: CWinSystemOSXGL(); virtual ~CWinSystemOSXGL(); - virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop); - virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays); + virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop) override; + virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override; protected: - virtual void PresentRenderImpl(bool rendered); - virtual void SetVSyncImpl(bool enable); + virtual void PresentRenderImpl(bool rendered) override; + virtual void SetVSyncImpl(bool enable) override; }; XBMC_GLOBAL_REF(CWinSystemOSXGL,g_Windowing); |