summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2015-10-23 06:15:36 (GMT)
committer Lawrence Mok <lawrence.mok@amlogic.com>2015-10-26 22:59:51 (GMT)
commit8d7516f6e04fd18d8e1a1cb77a7acf266d4d743d (patch)
treec211bec63d80261ff5f969f42edc178a80e1ea89
parent327eadef2b307230360aec3f53d2a6cc5764c69a (diff)
downloadaudio-8d7516f6e04fd18d8e1a1cb77a7acf266d4d743d.zip
audio-8d7516f6e04fd18d8e1a1cb77a7acf266d4d743d.tar.gz
audio-8d7516f6e04fd18d8e1a1cb77a7acf266d4d743d.tar.bz2
modify for compile error
Change-Id: Ide6c95a5fa55fe30a8b47eeda9c4e8cb82765ba2
Diffstat
-rw-r--r--Android.mk7
-rw-r--r--DLGAudioPolicyManager.cpp10
2 files changed, 12 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 86f6eaa..9fa9e86 100644
--- a/Android.mk
+++ b/Android.mk
@@ -111,7 +111,12 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_C_INCLUDES := \
external/tinyalsa/include \
- $(TOPDIR)frameworks/av/services/audiopolicy
+ $(TOPDIR)frameworks/av/services/audiopolicy \
+ $(TOPDIR)frameworks/av/services/audiopolicy/managerdefault \
+ $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface \
+ $(TOPDIR)frameworks/av/services/audiopolicy/common/managerdefinitions/include \
+ $(TOPDIR)frameworks/av/services/audiopolicy/common/include
+
LOCAL_MODULE := libaudiopolicymanager
LOCAL_MODULE_TAGS := optional
diff --git a/DLGAudioPolicyManager.cpp b/DLGAudioPolicyManager.cpp
index fa3893d..08d0499 100644
--- a/DLGAudioPolicyManager.cpp
+++ b/DLGAudioPolicyManager.cpp
@@ -37,7 +37,9 @@ namespace android {
extern "C" AudioPolicyInterface* createAudioPolicyManager(
AudioPolicyClientInterface *clientInterface)
{
- return new DLGAudioPolicyManager(clientInterface);
+ //invalid new-expression of abstract class
+ //return new DLGAudioPolicyManager(clientInterface);
+ return NULL;
}
extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface)
@@ -62,7 +64,7 @@ float DLGAudioPolicyManager::computeVolume(audio_stream_type_t stream,
(void)index;
(void)output;
(void)device;
- return AudioPolicyManager::computeVolume(stream,index,output,device);
+ return 0.0f;//return AudioPolicyManager::computeVolume(stream,index,output,device);
}
status_t DLGAudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
@@ -86,8 +88,8 @@ status_t DLGAudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
status_t ret = 0;
if (device != AUDIO_DEVICE_IN_REMOTE_SUBMIX) {
- ret = AudioPolicyManager::setDeviceConnectionState(
- device, state, device_address);
+ //ret = AudioPolicyManager::setDeviceConnectionState(
+ // device, state, device_address);
}
return ret;