diff options
| author | Christopher N. Hesse <raymanfx@gmail.com> | 2018-01-28 00:07:47 +0100 |
|---|---|---|
| committer | Christopher N. Hesse <raymanfx@gmail.com> | 2018-02-16 11:59:28 +0100 |
| commit | d8d04fd4972165e2d9de0c2f0549dbb1d722cbe7 (patch) | |
| tree | 1e240584db809e26250a047ad5f4e262018c454a /audio | |
| parent | 2beff4222c8eb3c2f0ee0f419bc68c1b062eeab0 (diff) | |
| download | hardware_samsung-d8d04fd4972165e2d9de0c2f0549dbb1d722cbe7.tar.gz hardware_samsung-d8d04fd4972165e2d9de0c2f0549dbb1d722cbe7.tar.bz2 hardware_samsung-d8d04fd4972165e2d9de0c2f0549dbb1d722cbe7.zip | |
audio: Support new and old mixer paths locations
Change-Id: Ifa2a55cbfe45ab9d53cd23098012443f9b32ca31
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index bd15634..54ae924 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -539,10 +539,15 @@ static int mixer_init(struct audio_device *adev) } } while (mixer == NULL); - sprintf(mixer_path, "/system/etc/mixer_paths_%d.xml", card); + sprintf(mixer_path, "/vendor/etc/mixer_paths_%d.xml", card); if (access(mixer_path, F_OK) == -1) { - ALOGE("%s: Failed to load mixer paths from %s, your system is going to crash", + ALOGW("%s: Failed to open mixer paths from %s, retrying with legacy location", __func__, mixer_path); + sprintf(mixer_path, "/system/etc/mixer_paths_%d.xml", card); + if (access(mixer_path, F_OK) == -1) { + ALOGE("%s: Failed to load a mixer paths configuration, your system will crash", + __func__); + } } audio_route = audio_route_init(card, mixer_path); |