commit 9746c4758b161e26eec92b1ef1ff1bf0ba0bd268
author Ajay Dudani <adudani@codeaurora.org> Mon Jun 18 16:01:16 2012 -0700
committer Iliyan Malchev <malchev@google.com> Thu Jun 21 12:06:48 2012 -0700
tree bdc4745b6b1d1a647fbb471e3a96a4cf5d950eb8
parent 4113f34dfbaa8d82a5e1ef0265e916317161984d

audio: Updates to comply with standard libhardware_legacy audio hal

Revert back to original libhardware_legacy audio hal headers from AOSP.
This makes corresponding code changes to disable features to match
audio hal implementation with standard libhardware_legacy audio hal.

Change-Id: Ibf1e50d3fffc8280ba417a26172c0f04206474e3

alsa_sound/AudioStreamOutALSA.cpp

diff --git a/alsa_sound/AudioStreamOutALSA.cpp b/alsa_sound/AudioStreamOutALSA.cpp
index b370791..88ac299 100644
--- a/alsa_sound/AudioStreamOutALSA.cpp
+++ b/alsa_sound/AudioStreamOutALSA.cpp
@@ -25,8 +25,9 @@
 #include <dlfcn.h>
 #include <math.h>
 
-#define LOG_TAG "audio.primary.msm8960"
+#define LOG_TAG "AudioStreamOutALSA"
 //#define LOG_NDEBUG 0
+#define LOG_NDDEBUG 0
 #include <utils/Log.h>
 #include <utils/String8.h>
 
@@ -144,7 +145,7 @@
             free(use_case);
             if((!strcmp(mHandle->useCase, SND_USE_CASE_VERB_IP_VOICECALL)) ||
                (!strcmp(mHandle->useCase, SND_USE_CASE_MOD_PLAY_VOIP))) {
-#if 0
+#ifdef QCOM_USBAUDIO_ENABLED
                 if((mDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET)||
                       (mDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)||
                       (mDevices & AudioSystem::DEVICE_OUT_PROXY)) {
@@ -155,7 +156,7 @@
                 {
                   mHandle->module->route(mHandle, mDevices , AudioSystem::MODE_IN_COMMUNICATION);
                 }
-#if 0
+#ifdef QCOM_USBAUDIO_ENABLED
             } else if((mDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET)||
                       (mDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)||
                       (mDevices & AudioSystem::DEVICE_OUT_PROXY)) {
@@ -183,7 +184,7 @@
                 mParent->mLock.unlock();
                 return 0;
             }
-#if 0
+#ifdef QCOM_USBAUDIO_ENABLED
             if((mHandle->devices == AudioSystem::DEVICE_IN_ANLG_DOCK_HEADSET)||
                    (mHandle->devices == AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET)){
                 if((!strcmp(mHandle->useCase, SND_USE_CASE_VERB_IP_VOICECALL)) ||
@@ -199,6 +200,7 @@
         mParent->mLock.unlock();
     }
 
+#ifdef QCOM_USBAUDIO_ENABLED
     if(((mDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET) ||
         (mDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) &&
         (!mParent->musbPlaybackState)) {
@@ -215,6 +217,7 @@
         }
         mParent->mLock.unlock();
     }
+#endif
 
     period_size = mHandle->periodSize;
     do {
@@ -231,8 +234,8 @@
                       period_size);
         }
         if (n < 0) {
-	    mParent->mLock.lock();
-            ALOGE("pcm_write returned error %d, trying to recover\n", n);
+            mParent->mLock.lock();
+            ALOGE("pcm_write returned error %l, trying to recover\n", n);
             pcm_close(mHandle->handle);
             mHandle->handle = NULL;
             if((!strncmp(mHandle->useCase, SND_USE_CASE_VERB_IP_VOICECALL, strlen(SND_USE_CASE_VERB_IP_VOICECALL))) ||
@@ -277,6 +280,7 @@
     if((!strcmp(mHandle->useCase, SND_USE_CASE_VERB_IP_VOICECALL)) ||
         (!strcmp(mHandle->useCase, SND_USE_CASE_MOD_PLAY_VOIP))) {
          if((mParent->mVoipStreamCount)) {
+#ifdef QCOM_USBAUDIO_ENABLED
              if(mParent->mVoipStreamCount == 1) {
                  ALOGD("Deregistering VOIP Call bit, musbPlaybackState:%d, musbRecordingState: %d",
                        mParent->musbPlaybackState, mParent->musbRecordingState);
@@ -285,11 +289,14 @@
                  mParent->closeUsbPlaybackIfNothingActive();
                  mParent->closeUsbRecordingIfNothingActive();
              }
+#endif
                 return NO_ERROR;
          }
          mParent->mVoipStreamCount = 0;
          mParent->mVoipMicMute = 0;
-    } else if((!strcmp(mHandle->useCase, SND_USE_CASE_VERB_HIFI_LOW_POWER)) ||
+    }
+#ifdef QCOM_USBAUDIO_ENABLED
+      else if((!strcmp(mHandle->useCase, SND_USE_CASE_VERB_HIFI_LOW_POWER)) ||
               (!strcmp(mHandle->useCase, SND_USE_CASE_MOD_PLAY_LPA))) {
         mParent->musbPlaybackState &= ~USBPLAYBACKBIT_LPA;
     } else {
@@ -297,6 +304,7 @@
     }
 
     mParent->closeUsbPlaybackIfNothingActive();
+#endif
 
     ALSAStreamOps::close();
 
@@ -314,6 +322,7 @@
         return NO_ERROR;
     }
 
+#ifdef QCOM_USBAUDIO_ENABLED
     if((!strcmp(mHandle->useCase, SND_USE_CASE_VERB_HIFI_LOW_POWER)) ||
         (!strcmp(mHandle->useCase, SND_USE_CASE_MOD_PLAY_LPA))) {
         ALOGD("Deregistering LPA bit");
@@ -322,10 +331,13 @@
         ALOGD("Deregistering MUSIC bit, musbPlaybackState: %d", mParent->musbPlaybackState);
         mParent->musbPlaybackState &= ~USBPLAYBACKBIT_MUSIC;
     }
+#endif
 
     mHandle->module->standby(mHandle);
 
+#ifdef QCOM_USBAUDIO_ENABLED
     mParent->closeUsbPlaybackIfNothingActive();
+#endif
 
     mFrameCount = 0;