summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2016-09-13 00:48:57 +0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2016-09-13 00:48:57 +0800
commita5bc8ec212b9f366d7f9da972a81caf153e8ff89 (patch)
tree66dfe039650b32f15bf0c29e8ade471dc6beded5
parent3ac75230e3ea49f9c8bbae5f1f48a2442ad907cd (diff)
downloadplatform_hardware_libaudio-a5bc8ec212b9f366d7f9da972a81caf153e8ff89.tar.gz
platform_hardware_libaudio-a5bc8ec212b9f366d7f9da972a81caf153e8ff89.tar.bz2
platform_hardware_libaudio-a5bc8ec212b9f366d7f9da972a81caf153e8ff89.zip
audio_hw: allow to select HDMI audio manually
Before we can select HDMI audio automatically, let the user do it manually by setting hal.audio.primary.hdmi=1.
-rw-r--r--audio_hw.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/audio_hw.c b/audio_hw.c
index 01d42d0..7ca3e6c 100644
--- a/audio_hw.c
+++ b/audio_hw.c
@@ -221,7 +221,11 @@ struct snd_pcm_info *select_card(unsigned int device __unused, unsigned int flag
free(namelist);
}
}
- info = cached_info[d] ? cached_info[d] : cached_info[d + 2];
+ if (property_get_bool("hal.audio.primary.hdmi", false) && cached_info[d + 2]) {
+ info = cached_info[d + 2];
+ } else {
+ info = cached_info[d] ? cached_info[d] : cached_info[d + 2];
+ }
ALOGI_IF(info, "choose pcmC%dD%d%c", info->card, info->device, d ? 'c' : 'p');
return info;
}