diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-05-10 12:16:28 +0200 |
|---|---|---|
| committer | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-05-10 12:16:28 +0200 |
| commit | 6e5ede3663b7d2601171b241534b11b2f45d19df (patch) | |
| tree | 63df56e12460402c7e4d91ca29f7846f4721a495 | |
| parent | 2d3cfbe55c5b977d086d47bed17cc1ff3edf30a9 (diff) | |
| parent | 81a870d59846911ad13790911e419e4827401dee (diff) | |
Merge pull request #7053 from OpenELEC/aml-fixes
| -rw-r--r-- | xbmc/settings/Settings.cpp | 11 | ||||
| -rw-r--r-- | xbmc/utils/AMLUtils.cpp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index 4b2e71cca5..7ad8751a6b 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -52,6 +52,9 @@ #if defined(TARGET_RASPBERRY_PI) #include "linux/RBP.h" #endif +#if defined(HAS_LIBAMCODEC) +#include "utils/AMLUtils.h" +#endif // defined(HAS_LIBAMCODEC) #include "peripherals/Peripherals.h" #include "powermanagement/PowerManager.h" #include "profiles/ProfilesManager.h" @@ -456,6 +459,10 @@ bool CSettings::InitializeDefinitions() #elif defined(TARGET_ANDROID) if (CFile::Exists(SETTINGS_XML_FOLDER "android.xml") && !Initialize(SETTINGS_XML_FOLDER "android.xml")) CLog::Log(LOGFATAL, "Unable to load android-specific settings definitions"); +#if defined(HAS_LIBAMCODEC) + if (aml_present() && CFile::Exists(SETTINGS_XML_FOLDER "aml-android.xml") && !Initialize(SETTINGS_XML_FOLDER "aml-android.xml")) + CLog::Log(LOGFATAL, "Unable to load aml-android-specific settings definitions"); +#endif // defined(HAS_LIBAMCODEC) #elif defined(TARGET_RASPBERRY_PI) if (CFile::Exists(SETTINGS_XML_FOLDER "rbp.xml") && !Initialize(SETTINGS_XML_FOLDER "rbp.xml")) CLog::Log(LOGFATAL, "Unable to load rbp-specific settings definitions"); @@ -470,6 +477,10 @@ bool CSettings::InitializeDefinitions() #elif defined(TARGET_LINUX) if (CFile::Exists(SETTINGS_XML_FOLDER "linux.xml") && !Initialize(SETTINGS_XML_FOLDER "linux.xml")) CLog::Log(LOGFATAL, "Unable to load linux-specific settings definitions"); +#if defined(HAS_LIBAMCODEC) + if (aml_present() && CFile::Exists(SETTINGS_XML_FOLDER "aml-linux.xml") && !Initialize(SETTINGS_XML_FOLDER "aml-linux.xml")) + CLog::Log(LOGFATAL, "Unable to load aml-linux-specific settings definitions"); +#endif // defined(HAS_LIBAMCODEC) #elif defined(TARGET_DARWIN) if (CFile::Exists(SETTINGS_XML_FOLDER "darwin.xml") && !Initialize(SETTINGS_XML_FOLDER "darwin.xml")) CLog::Log(LOGFATAL, "Unable to load darwin-specific settings definitions"); diff --git a/xbmc/utils/AMLUtils.cpp b/xbmc/utils/AMLUtils.cpp index d5d32920fa..bcb57fcd46 100644 --- a/xbmc/utils/AMLUtils.cpp +++ b/xbmc/utils/AMLUtils.cpp @@ -134,9 +134,9 @@ bool aml_permissions() { CLog::Log(LOGERROR, "AML: no rw on /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq"); } - if (!SysfsUtils::HasRW("/sys/devices/cpu/cpu/cpu0/cpufreq/scaling_governor")) + if (!SysfsUtils::HasRW("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor")) { - CLog::Log(LOGERROR, "AML: no rw on /sys/devices/cpu/cpu/cpu0/cpufreq/scaling_governor"); + CLog::Log(LOGERROR, "AML: no rw on /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"); } #endif } |