diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-09-01 15:14:57 -0700 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-09-01 15:14:57 -0700 |
| commit | 9d8dfd50c47ce19566f245cf5d2ae30f0b189f0f (patch) | |
| tree | a2bce517529346111ed0459bf692a6f88341b7af | |
| parent | 7f79eef14a9178b2907cf1965ef06831e6784229 (diff) | |
| parent | 9bf30f0c614cc54c9c25bb30ccb14f8787d706ca (diff) | |
Merge pull request #3174 from amet/smc
[atv2/ios] fix failed build after e831da6192a25e219754cbdb0672842fc262262e
| -rw-r--r-- | XBMC.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 8 | ||||
| -rw-r--r-- | xbmc/utils/CPUInfo.cpp | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index 72efb004ee..4b6a43aae2 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -29,8 +29,6 @@ 0E3036ED1760F68A00D93596 /* FavouritesDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0E3036EA1760F68A00D93596 /* FavouritesDirectory.cpp */; }; 0E3036EE1760F68A00D93596 /* FavouritesDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0E3036EA1760F68A00D93596 /* FavouritesDirectory.cpp */; }; 180F6C8117CE9A5700127892 /* smc.c in Sources */ = {isa = PBXBuildFile; fileRef = 180F6C8017CE9A5700127892 /* smc.c */; }; - 180F6C8217CE9A5700127892 /* smc.c in Sources */ = {isa = PBXBuildFile; fileRef = 180F6C8017CE9A5700127892 /* smc.c */; }; - 180F6C8317CE9A5700127892 /* smc.c in Sources */ = {isa = PBXBuildFile; fileRef = 180F6C8017CE9A5700127892 /* smc.c */; }; 183FDF8A11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; }; 18404DA61396C31B00863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DA51396C31B00863BBA /* SlingboxLib.a */; }; 1840B74D13993D8A007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B74B13993D8A007C848B /* JSONVariantParser.cpp */; }; @@ -11629,7 +11627,6 @@ F59EED8017AD5174005BB7C6 /* ApplicationPlayer.cpp in Sources */, DF29668217B2B04300DF10F9 /* SettingRequirement.cpp in Sources */, DF28DF4F17B8379E0077F41A /* ProfilesOperations.cpp in Sources */, - 180F6C8317CE9A5700127892 /* smc.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -12659,7 +12656,6 @@ F59EED7F17AD5174005BB7C6 /* ApplicationPlayer.cpp in Sources */, DF29668117B2B04300DF10F9 /* SettingRequirement.cpp in Sources */, DF28DF4E17B8379E0077F41A /* ProfilesOperations.cpp in Sources */, - 180F6C8217CE9A5700127892 /* smc.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 9574966fb1..935118aefb 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -85,7 +85,7 @@ #include "cores/AudioEngine/Utils/AEUtil.h" #include "cores/VideoRenderers/BaseRenderer.h" -#if defined(TARGET_DARWIN) +#if defined(TARGET_DARWIN_OSX) #include "osx/smc.h" #include "linux/LinuxResourceCounter.h" static CLinuxResourceCounter m_resourceCounter; @@ -4015,9 +4015,9 @@ string CGUIInfoManager::GetSystemHeatInfo(int info) text.Format("%i%%", m_fanSpeed * 2); break; case SYSTEM_CPU_USAGE: -#if defined(TARGET_DARWIN) +#if defined(TARGET_DARWIN_OSX) text.Format("%4.2f%%", m_resourceCounter.GetCPUUsage()); -#elif defined(TARGET_WINDOWS) +#elif defined(TARGET_DARWIN) || defined(TARGET_WINDOWS) text.Format("%d%%", g_cpuInfo.getUsedPercentage()); #else text.Format("%s", g_cpuInfo.GetCoresUsageString()); @@ -4032,7 +4032,7 @@ CTemperature CGUIInfoManager::GetGPUTemperature() int value = 0; char scale = 0; -#if defined(TARGET_DARWIN) +#if defined(TARGET_DARWIN_OSX) value = SMCGetTemperature(SMC_KEY_GPU_TEMP); return CTemperature::CreateFromCelsius(value); #else diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp index efbeb53014..d54627e73c 100644 --- a/xbmc/utils/CPUInfo.cpp +++ b/xbmc/utils/CPUInfo.cpp @@ -26,11 +26,13 @@ #if defined(TARGET_DARWIN) #include <sys/types.h> #include <sys/sysctl.h> +#ifdef TARGET_DARWIN_OSX #include "osx/smc.h" #ifdef __ppc__ #include <mach-o/arch.h> #endif #endif +#endif #if defined(TARGET_FREEBSD) #include <sys/types.h> @@ -508,7 +510,7 @@ bool CCPUInfo::getTemperature(CTemperature& temperature) int value = 0; char scale = 0; -#if defined(TARGET_DARWIN) +#if defined(TARGET_DARWIN_OSX) value = SMCGetTemperature(SMC_KEY_CPU_TEMP); scale = 'c'; #else |