Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: xbmc/xbmc
...
head fork: xbmc/xbmc
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Dec 11, 2012
@fritsch fritsch AE: don't disable devices - as detection does not work reliable fb9af19
Commits on Dec 12, 2012
@anssih anssih 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
68dce43
Showing with 7 additions and 14 deletions.
  1. +7 −14 xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
View
21 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

No commit comments for this range

Something went wrong with that request. Please try again.