|
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2014-04-21 13:36:56.099428215 +0200 |
|
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2014-04-21 13:36:56.111428214 +0200 |
|
@@ -721,9 +721,11 @@ |
|
* We don't want to do that if "default" can handle multichannel |
|
* itself (e.g. in case of a pulseaudio server). */ |
|
|
|
+#ifndef WANDBOARD_ENUM |
|
/* For Wandboard, we do not enurate default device as it will be grabbed |
|
* as one of the sysdefault devices... */ |
|
- |
|
+ EnumerateDevice(list, "default", "", config); |
|
+#endif |
|
|
|
void **hints; |
|
|
|
@@ -774,8 +776,11 @@ |
|
* found by the enumeration process. Skip them as well ("hw", "dmix", |
|
* "plughw", "dsnoop"). */ |
|
|
|
- /* For wandboard all devices are prefixed by sysdefault so do not ignore them */ |
|
else if (baseName != "default" |
|
+#ifndef WANDBOARD_ENUM |
|
+ /* For wandboard all devices are prefixed by sysdefault so do not ignore them */ |
|
+ && baseName != "sysdefault" |
|
+#endif |
|
&& baseName != "surround40" |
|
&& baseName != "surround41" |
|
&& baseName != "surround50" |
|
@@ -884,6 +889,7 @@ |
|
|
|
AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) |
|
{ |
|
+#ifdef WANDBOARD_ENUM |
|
std::size_t found; |
|
|
|
/* Hack : Check for specific wandboard sound device names */ |
|
@@ -898,7 +904,7 @@ |
|
found = name.find("sgtl5000audio"); |
|
if (found!=std::string::npos) |
|
return AE_DEVTYPE_PCM; |
|
- |
|
+#endif |
|
|
|
if (name.substr(0, 4) == "hdmi") |
|
return AE_DEVTYPE_HDMI; |