Permalink
Browse files

Merge pull request #1779 from fritsch/xbmc-upstream

AE: don't hide ALSA HDMI devices based on missing ELD data - it does not work reliably enough
  • Loading branch information...
2 parents afbae11 + fb9af19 commit 68dce4359ce790b5842d2902c4feac2a9ab660e0 @anssih anssih committed Dec 12, 2012
Showing with 7 additions and 14 deletions.
  1. +7 −14 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

0 comments on commit 68dce43

Please sign in to comment.