Keyassist dev

audio/Android.mk

@@ -25,14 +25,20 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := audio.primary.waydroid
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := audio_hw.c
-LOCAL_SHARED_LIBRARIES := liblog libcutils libasound
+LOCAL_SRC_FILES := pa_volume_ctl.c audio_hw.c
+LOCAL_SHARED_LIBRARIES := liblog libcutils libasound libpulse
 LOCAL_HEADER_LIBRARIES := libhardware_headers
-LOCAL_CFLAGS := -Wno-unused-parameter
+LOCAL_CFLAGS := -Wno-unused-parameter \
+    -Wno-error \
+    -DPACKAGE \
+    -DPACKAGE_NAME=\"pulseaudio\" \
+    -DPACKAGE_VERSION=\"1.99\"
+
 LOCAL_C_INCLUDES += \
         external/alsa-lib/include \
         external/expat/lib \
         system/media/audio_utils/include \
-        system/media/audio_effects/include
+        system/media/audio_effects/include \
+        external/pulseaudio/src
 
 include $(BUILD_SHARED_LIBRARY)

audio/audio_hw.c

@@ -40,6 +40,7 @@
 #include <audio_utils/echo_reference.h>
 #include <hardware/audio_effect.h>
 #include <audio_effects/effect_aec.h>
+#include "pa_volume_ctl.h"
 
 /* Minimum granularity - Arbitrary but small value */
 #define CODEC_BASE_FRAME_COUNT 32
@@ -881,25 +882,23 @@ static int adev_set_voice_volume(struct audio_hw_device *dev, float volume)
 static int adev_set_master_volume(struct audio_hw_device *dev, float volume)
 {
     ALOGV("adev_set_master_volume: %f", volume);
-    return -ENOSYS;
+    return pa_set_master_volume(volume);
 }
 
 static int adev_get_master_volume(struct audio_hw_device *dev, float *volume)
 {
-    ALOGV("adev_get_master_volume: %f", *volume);
-    return -ENOSYS;
+    return pa_get_master_volume(volume);
 }
 
 static int adev_set_master_mute(struct audio_hw_device *dev, bool muted)
 {
     ALOGV("adev_set_master_mute: %d", muted);
-    return -ENOSYS;
+    return pa_set_master_mute(muted);
 }
 
 static int adev_get_master_mute(struct audio_hw_device *dev, bool *muted)
 {
-    ALOGV("adev_get_master_mute: %d", *muted);
-    return -ENOSYS;
+    return pa_get_master_mute(muted);
 }
 
 static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode)