diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-07-05 21:31:14 +0200 |
|---|---|---|
| committer | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-07-05 21:31:14 +0200 |
| commit | 92877baf765447428d108933ad1b1bc4acee8918 (patch) | |
| tree | 81ed363c89a2d10052fcbfc40bdcb60ee2cd809d | |
| parent | 47e8ebe1843b1284a6331c0142f2d8d251daab78 (diff) | |
| parent | e5f244ed0d0b447d18531614a3be65f04cb31732 (diff) | |
Merge pull request #7417 from fritsch/remove-fps-is
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 10 | ||||
| -rw-r--r-- | xbmc/video/windows/GUIWindowFullScreen.cpp | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index b4f19d443d..8cf1202b94 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -1748,18 +1748,16 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string * case SYSTEM_SCREEN_RESOLUTION: if(g_Windowing.IsFullScreen()) - strLabel = StringUtils::Format("%ix%i@%.2fHz - %s (%02.2f fps)", + strLabel = StringUtils::Format("%ix%i@%.2fHz - %s", CDisplaySettings::Get().GetCurrentResolutionInfo().iScreenWidth, CDisplaySettings::Get().GetCurrentResolutionInfo().iScreenHeight, CDisplaySettings::Get().GetCurrentResolutionInfo().fRefreshRate, - g_localizeStrings.Get(244).c_str(), - GetFPS()); + g_localizeStrings.Get(244).c_str()); else - strLabel = StringUtils::Format("%ix%i - %s (%02.2f fps)", + strLabel = StringUtils::Format("%ix%i - %s", CDisplaySettings::Get().GetCurrentResolutionInfo().iScreenWidth, CDisplaySettings::Get().GetCurrentResolutionInfo().iScreenHeight, - g_localizeStrings.Get(242).c_str(), - GetFPS()); + g_localizeStrings.Get(242).c_str()); return strLabel; break; diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp index 6b405160c2..8f29682fcc 100644 --- a/xbmc/video/windows/GUIWindowFullScreen.cpp +++ b/xbmc/video/windows/GUIWindowFullScreen.cpp @@ -420,9 +420,8 @@ void CGUIWindowFullScreen::FrameMove() , clockspeed - 100.0 , g_renderManager.GetVSyncState().c_str()); - strGeneralFPS = StringUtils::Format("%s\nW( fps:%02.2f %s )\n%s" + strGeneralFPS = StringUtils::Format("%s\nW( %s )\n%s" , strGeneral.c_str() - , g_infoManager.GetFPS() , strCores.c_str(), strClock.c_str() ); CGUIMessage msg(GUI_MSG_LABEL_SET, GetID(), LABEL_ROW3); |