add BOARD_USES_ECLAIR_LIBAUDIO (used on Milestone port)

nadlabak · Sep 19, 2010 · dd4a761 · dd4a761 · nadlabak · Sep 20, 2010
1 parent dd699a2
commit dd4a761
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/libs/audioflinger/Android.mk b/libs/audioflinger/Android.mk
@@ -99,6 +99,10 @@ ifeq ($(strip $(BOARD_USES_GENERIC_AUDIO)),true)
   LOCAL_CFLAGS += -DGENERIC_AUDIO
 else
   LOCAL_SHARED_LIBRARIES += libaudio libaudiopolicy
+  ifeq ($(BOARD_USES_ECLAIR_LIBAUDIO),true)
+    LOCAL_STATIC_LIBRARIES += libaudiopolicybase
+    LOCAL_CFLAGS += -DBOARD_USES_ECLAIR_LIBAUDIO
+  endif
 endif
 
 ifeq ($(TARGET_SIMULATOR),true)

diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
@@ -1271,6 +1271,9 @@ void AudioFlinger::PlaybackThread::readOutputParameters()
 
 status_t AudioFlinger::PlaybackThread::getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames)
 {
+#ifdef BOARD_USES_ECLAIR_LIBAUDIO
+    return INVALID_OPERATION;
+#else
     if (halFrames == 0 || dspFrames == 0) {
         return BAD_VALUE;
     }
@@ -1280,6 +1283,7 @@ status_t AudioFlinger::PlaybackThread::getRenderPosition(uint32_t *halFrames, ui
     *halFrames = mBytesWritten/mOutput->frameSize();
 
     return mOutput->getRenderPosition(dspFrames);
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -3727,7 +3731,11 @@ void AudioFlinger::RecordThread::readInputParameters()
 
 unsigned int AudioFlinger::RecordThread::getInputFramesLost()
 {
+#ifdef BOARD_USES_ECLAIR_LIBAUDIO
+    return 0;
+#else
     return mInput->getInputFramesLost();
+#endif
 }
 
 // ----------------------------------------------------------------------------