xbmc: update to xbmc-37e8e4e

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-11-14 01:24:01 +01:00
parent 97cbe64251
commit d003118d6e
14 changed files with 47 additions and 2 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="860cd91"
PKG_VERSION="37e8e4e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="860cd91"
PKG_VERSION="37e8e4e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -0,0 +1,45 @@
From ca418bfb8414fb6045af89d61adabfdbf5c7a6ea Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Tue, 13 Nov 2012 22:53:01 +0100
Subject: [PATCH] AE: don't disable devices - as detection does not work
reliable
---
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index d391595..268b002 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -952,20 +952,13 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev
if (badHDMI)
{
- /* only trust badHDMI (= unconnected or non-existent port) on Intel
- * and NVIDIA where it has been confirmed to work, show the empty
- * port on other systems */
- if (info.m_displayName.compare(0, 9, "HDA Intel") == 0 || info.m_displayName.compare(0, 10, "HDA NVidia") == 0)
- {
- /* unconnected HDMI port */
- CLog::Log(LOGDEBUG, "CAESinkALSA - Skipping HDMI device \"%s\" as it has no ELD data", device.c_str());
- snd_pcm_close(pcmhandle);
- return;
- }
- else
- {
- CLog::Log(LOGDEBUG, "CAESinkALSA - HDMI device \"%s\" may be unconnected (no ELD data)", device.c_str());
- }
+ /*
+ * Warn about disconnected devices, but keep them enabled
+ * Detection can go wrong on Intel, Nvidia and on all
+ * AMD (fglrx) hardware, so it is not safe to close those
+ * handles
+ */
+ CLog::Log(LOGDEBUG, "CAESinkALSA - HDMI device \"%s\" may be unconnected (no ELD data)", device.c_str());
}
}
else
--
1.7.10