1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- media/audio/alsa/audio_manager_alsa.cc.orig 2017-04-19 19:06:35 UTC
+++ media/audio/alsa/audio_manager_alsa.cc
@@ -138,7 +138,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
int card = -1;
// Loop through the sound cards to get ALSA device hints.
+#ifdef OS_LINUX
while (!wrapper_->CardNext(&card) && card >= 0) {
+#endif
void** hints = NULL;
int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
if (!error) {
@@ -150,7 +152,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
<< wrapper_->StrError(error);
}
+#ifdef OS_LINUX
}
+#endif
}
void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
@@ -232,7 +236,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
// goes through software conversion if needed (e.g. incompatible
// sample rate).
// TODO(joi): Should we prefer "hw" instead?
+#ifdef OS_LINUX
static const char kDeviceTypeDesired[] = "plughw";
+#else
+ static const char kDeviceTypeDesired[] = "plug";
+#endif
return strncmp(kDeviceTypeDesired,
device_name,
arraysize(kDeviceTypeDesired) - 1) == 0;
@@ -256,7 +264,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
// Loop through the sound cards.
// Don't use snd_device_name_hint(-1,..) since there is a access violation
// inside this ALSA API with libasound.so.2.0.0.
+#ifdef OS_LINUX
while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) {
+#endif
int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
if (!error) {
for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
@@ -280,7 +290,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
<< wrapper_->StrError(error);
}
+#ifdef OS_LINUX
}
+#endif
return has_device;
}
|
