update for compatibility with ICS

Namespace has been changed from android to android_audio_legacy.
Module names have been updated to new ICS standards

diff --git a/ALSAControl.cpp b/ALSAControl.cpp
index 65fd86f..e08ffc0 100644 (file)
--- a/ALSAControl.cpp
+++ b/ALSAControl.cpp
@@ -33,7 +33,7 @@
 
 #include "AudioHardwareALSA.h"
 
-namespace android
+namespace android_audio_legacy
 {
 
 ALSAControl::ALSAControl(const char *device)
@@ -214,4 +214,4 @@ status_t ALSAControl::set(const char *name, const char *value)
     return BAD_VALUE;
 }
 
-};        // namespace android
+};        // namespace android_audio_legacy

diff --git a/ALSAMixer.cpp b/ALSAMixer.cpp
index 8e33a6b..5711105 100644 (file)
--- a/ALSAMixer.cpp
+++ b/ALSAMixer.cpp
@@ -42,7 +42,7 @@
     if (strlen(x) + strlen(y) < ALSA_NAME_MAX) \
         strcat(x, y);
 
-namespace android
+namespace android_audio_legacy
 {
 
 // ----------------------------------------------------------------------------
@@ -430,4 +430,4 @@ status_t ALSAMixer::getPlaybackMuteState(uint32_t device, bool *state)
     return BAD_VALUE;
 }
 
-};        // namespace android
+};        // namespace android_audio_legacy

diff --git a/ALSAStreamOps.cpp b/ALSAStreamOps.cpp
index e450dd0..23df313 100644 (file)
--- a/ALSAStreamOps.cpp
+++ b/ALSAStreamOps.cpp
@@ -33,7 +33,7 @@
 
 #include "AudioHardwareALSA.h"
 
-namespace android
+namespace android_audio_legacy
 {
 
 // ----------------------------------------------------------------------------
@@ -289,4 +289,4 @@ status_t ALSAStreamOps::open(int mode)
     return mParent->mALSADevice->open(mHandle, mHandle->curDev, mode);
 }
 
-}       // namespace android
+}       // namespace android_audio_legacy

diff --git a/Android.mk b/Android.mk
index 6c56f63..4414bac 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@
 # Copyright 2008 Wind River Systems
 #
 
-ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
+ifneq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
 
   LOCAL_PATH := $(call my-dir)
 
@@ -24,7 +24,11 @@ ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
 
   LOCAL_MODULE := libaudio
 
-  LOCAL_STATIC_LIBRARIES += libaudiointerface
+  LOCAL_STATIC_LIBRARIES := \
+    libmedia_helper
+
+  LOCAL_WHOLE_STATIC_LIBRARIES := \
+    libaudiohw_legacy
 
   LOCAL_SHARED_LIBRARIES := \
     libasound \
@@ -37,6 +41,7 @@ ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
   LOCAL_SHARED_LIBRARIES += liba2dp
+# LOCAL_SHARED_LIBRARIES += audio.a2dp.default
 endif
 
   include $(BUILD_SHARED_LIBRARY)
@@ -45,6 +50,8 @@ endif
 
   include $(CLEAR_VARS)
 
+  LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+
   LOCAL_CFLAGS := -D_POSIX_SOURCE
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
@@ -53,9 +60,15 @@ endif
 
   LOCAL_SRC_FILES := AudioPolicyManagerALSA.cpp
 
-  LOCAL_MODULE := libaudiopolicy
+# LOCAL_MODULE := libaudiopolicy
+  LOCAL_MODULE_TAGS := optional
+  LOCAL_MODULE := audio_policy.$(TARGET_PRODUCT)
 
-  LOCAL_WHOLE_STATIC_LIBRARIES += libaudiopolicybase
+  LOCAL_STATIC_LIBRARIES := \
+    libmedia_helper
+
+  LOCAL_WHOLE_STATIC_LIBRARIES := \
+    libaudiopolicy_legacy
 
   LOCAL_SHARED_LIBRARIES := \
     libcutils \
@@ -68,8 +81,6 @@ endif
 
   include $(CLEAR_VARS)
 
-  LOCAL_PRELINK_MODULE := false
-
   LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
   LOCAL_CFLAGS := -D_POSIX_SOURCE -Wno-multichar
@@ -87,7 +98,7 @@ endif
        liblog
 
   LOCAL_MODULE_TAGS := optional
-  LOCAL_MODULE:= alsa.default
+  LOCAL_MODULE := audio.primary.$(TARGET_PRODUCT)
 
   include $(BUILD_SHARED_LIBRARY)
 
@@ -95,8 +106,6 @@ endif
 
   include $(CLEAR_VARS)
 
-  LOCAL_PRELINK_MODULE := false
-
   LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
   LOCAL_CFLAGS := -D_POSIX_SOURCE -Wno-multichar

diff --git a/AudioHardwareALSA.cpp b/AudioHardwareALSA.cpp
index cecfb4a..b31d05c 100644 (file)
--- a/AudioHardwareALSA.cpp
+++ b/AudioHardwareALSA.cpp
@@ -33,19 +33,19 @@
 
 #include "AudioHardwareALSA.h"
 
+namespace android_audio_legacy
+{
+
 extern "C"
 {
     //
     // Function for dlsym() to look up for creating a new AudioHardwareInterface.
     //
-    android::AudioHardwareInterface *createAudioHardware(void) {
-        return android::AudioHardwareALSA::create();
+    AudioHardwareInterface *createAudioHardware(void) {
+        return AudioHardwareALSA::create();
     }
 }         // extern "C"
 
-namespace android
-{
-
 // ----------------------------------------------------------------------------
 
 static void ALSAErrorHandler(const char *file,
@@ -79,7 +79,7 @@ AudioHardwareALSA::AudioHardwareALSA() :
     mMixer = new ALSAMixer;
 
     hw_module_t *module;
-    int err = hw_get_module(ALSA_HARDWARE_MODULE_ID,
+    int err = hw_get_module(AUDIO_HARDWARE_MODULE_ID,
             (hw_module_t const**)&module);
 
     if (err == 0) {
@@ -262,4 +262,4 @@ status_t AudioHardwareALSA::dump(int fd, const Vector<String16>& args)
     return NO_ERROR;
 }
 
-}       // namespace android
+}       // namespace android_audio_legacy

diff --git a/AudioHardwareALSA.h b/AudioHardwareALSA.h
index 29bc583..415444b 100644 (file)
--- a/AudioHardwareALSA.h
+++ b/AudioHardwareALSA.h
@@ -19,15 +19,20 @@
 #define ANDROID_AUDIO_HARDWARE_ALSA_H
 
 #include <utils/List.h>
+#include <utils/threads.h>
 #include <hardware_legacy/AudioHardwareBase.h>
 
 #include <alsa/asoundlib.h>
 
 #include <hardware/hardware.h>
 
-namespace android
+namespace android_audio_legacy
 {
 
+using android::List;
+using android::Mutex;
+using android::AutoMutex;
+
 class AudioHardwareALSA;
 
 /**
@@ -261,6 +266,15 @@ public:
     // Unit: the number of input audio frames
     virtual unsigned int  getInputFramesLost() const;
 
+    virtual status_t    addAudioEffect(effect_handle_t effect)
+    {
+        return NO_ERROR;
+    }
+    virtual status_t    removeAudioEffect(effect_handle_t effect)
+    {
+        return NO_ERROR;
+    }
+
     status_t            setAcousticParams(void* params);
 
     status_t            open(int mode);
@@ -360,5 +374,5 @@ protected:
 
 // ----------------------------------------------------------------------------
 
-};        // namespace android
+};        // namespace android_audio_legacy
 #endif    // ANDROID_AUDIO_HARDWARE_ALSA_H

diff --git a/AudioPolicyManagerALSA.cpp b/AudioPolicyManagerALSA.cpp
index 13fdb0e..026da05 100644 (file)
--- a/AudioPolicyManagerALSA.cpp
+++ b/AudioPolicyManagerALSA.cpp
@@ -20,7 +20,7 @@
 #include "AudioPolicyManagerALSA.h"
 #include <media/mediarecorder.h>
 
-namespace android {
+namespace android_audio_legacy {
 
 // ----------------------------------------------------------------------------
 // AudioPolicyManagerALSA
@@ -49,4 +49,4 @@ AudioPolicyManagerALSA::~AudioPolicyManagerALSA()
 {
 }
 
-}; // namespace android
+}; // namespace android_audio_legacy

diff --git a/AudioPolicyManagerALSA.h b/AudioPolicyManagerALSA.h
index b78ba4f..95c9f05 100644 (file)
--- a/AudioPolicyManagerALSA.h
+++ b/AudioPolicyManagerALSA.h
@@ -23,7 +23,7 @@
 #include <hardware_legacy/AudioPolicyManagerBase.h>
 
 
-namespace android {
+namespace android_audio_legacy {
 
 // ----------------------------------------------------------------------------
 

diff --git a/AudioStreamInALSA.cpp b/AudioStreamInALSA.cpp
index 32528a7..e7cb409 100644 (file)
--- a/AudioStreamInALSA.cpp
+++ b/AudioStreamInALSA.cpp
@@ -33,7 +33,7 @@
 
 #include "AudioHardwareALSA.h"
 
-namespace android
+namespace android_audio_legacy
 {
 
 AudioStreamInALSA::AudioStreamInALSA(AudioHardwareALSA *parent,
@@ -168,4 +168,4 @@ status_t AudioStreamInALSA::setAcousticParams(void *params)
     return aDev ? aDev->set_params(aDev, mAcoustics, params) : (status_t)NO_ERROR;
 }
 
-}       // namespace android
+}       // namespace android_audio_legacy

diff --git a/AudioStreamOutALSA.cpp b/AudioStreamOutALSA.cpp
index b295676..59635c6 100644 (file)
--- a/AudioStreamOutALSA.cpp
+++ b/AudioStreamOutALSA.cpp
@@ -37,7 +37,7 @@
 #define ALSA_DEFAULT_SAMPLE_RATE 44100 // in Hz
 #endif
 
-namespace android
+namespace android_audio_legacy
 {
 
 // ----------------------------------------------------------------------------
@@ -179,4 +179,4 @@ status_t AudioStreamOutALSA::getRenderPosition(uint32_t *dspFrames)
     return NO_ERROR;
 }
 
-}       // namespace android
+}       // namespace android_audio_legacy

diff --git a/alsa_default.cpp b/alsa_default.cpp
index d437f37..f56d2a6 100644 (file)
--- a/alsa_default.cpp
+++ b/alsa_default.cpp
@@ -33,7 +33,7 @@
 #define ALSA_DEFAULT_SAMPLE_RATE 44100 // in Hz
 #endif
 
-namespace android
+namespace android_audio_legacy
 {
 
 static int s_device_open(const hw_module_t*, const char*, hw_device_t**);
@@ -51,7 +51,7 @@ extern "C" const hw_module_t HAL_MODULE_INFO_SYM = {
     tag             : HARDWARE_MODULE_TAG,
     version_major   : 1,
     version_minor   : 0,
-    id              : ALSA_HARDWARE_MODULE_ID,
+    id              : AUDIO_HARDWARE_MODULE_ID,
     name            : "ALSA module",
     author          : "Wind River",
     methods         : &s_module_methods,
@@ -119,7 +119,7 @@ static alsa_handle_t _defaultsIn = {
     handle      : 0,
     format      : SND_PCM_FORMAT_S16_LE, // AudioSystem::PCM_16_BIT
     channels    : 1,
-    sampleRate  : AudioRecord::DEFAULT_SAMPLE_RATE,
+    sampleRate  : android::AudioRecord::DEFAULT_SAMPLE_RATE,
     latency     : 250000, // Desired Delay in usec
     bufferSize  : 2048, // Desired Number of samples
     modPrivate  : 0,