Created
December 13, 2014 10:27
-
-
Save Flex1911/79969e4bfe06cf91b647 to your computer and use it in GitHub Desktop.
Patch for cm12 to support old audio API
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp | |
index 25a77d0..81e8855 100644 | |
--- a/services/audioflinger/AudioFlinger.cpp | |
+++ b/services/audioflinger/AudioFlinger.cpp | |
@@ -153,11 +153,13 @@ static int load_audio_interface(const char *if_name, audio_hw_device_t **dev) | |
if (rc) { | |
goto out; | |
} | |
+#if !defined(ICS_AUDIO_BLOB) && !defined(MR0_AUDIO_BLOB) | |
if ((*dev)->common.version < AUDIO_DEVICE_API_VERSION_MIN) { | |
ALOGE("%s wrong audio hw device version %04x", __func__, (*dev)->common.version); | |
rc = BAD_VALUE; | |
goto out; | |
} | |
+#endif | |
return 0; | |
out: | |
@@ -1780,7 +1782,7 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) | |
AudioHwDevice::Flags flags = static_cast<AudioHwDevice::Flags>(0); | |
{ // scope for auto-lock pattern | |
AutoMutex lock(mHardwareLock); | |
- | |
+ #if !defined(ICS_AUDIO_BLOB) && !defined(MR0_AUDIO_BLOB) | |
if (0 == mAudioHwDevs.size()) { | |
mHardwareStatus = AUDIO_HW_GET_MASTER_VOLUME; | |
if (NULL != dev->get_master_volume) { | |
@@ -1798,20 +1800,21 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) | |
} | |
} | |
} | |
- | |
+#endif | |
mHardwareStatus = AUDIO_HW_SET_MASTER_VOLUME; | |
if ((NULL != dev->set_master_volume) && | |
(OK == dev->set_master_volume(dev, mMasterVolume))) { | |
flags = static_cast<AudioHwDevice::Flags>(flags | | |
AudioHwDevice::AHWD_CAN_SET_MASTER_VOLUME); | |
} | |
- | |
+#if !defined(ICS_AUDIO_BLOB) && !defined(MR0_AUDIO_BLOB) | |
mHardwareStatus = AUDIO_HW_SET_MASTER_MUTE; | |
if ((NULL != dev->set_master_mute) && | |
(OK == dev->set_master_mute(dev, mMasterMute))) { | |
flags = static_cast<AudioHwDevice::Flags>(flags | | |
AudioHwDevice::AHWD_CAN_SET_MASTER_MUTE); | |
} | |
+#endif | |
mHardwareStatus = AUDIO_HW_IDLE; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment