1 files changed, 10 insertions, 3 deletions
diff --git a/include/hardware_legacy/AudioHardwareInterface.h b/include/hardware_legacy/AudioHardwareInterface.h
index ba65d9a..198cff3 100644
--- a/include/hardware_legacy/AudioHardwareInterface.h
+++ b/include/hardware_legacy/AudioHardwareInterface.h
@@ -26,10 +26,17 @@
 #include <utils/String8.h>
 
 #include <media/IAudioFlinger.h>
-#include "media/AudioSystem.h"
+#include <hardware_legacy/AudioSystemLegacy.h>
 
+#include <hardware/audio.h>
+#include <hardware/audio_hal.h>
 
-namespace android {
+#include <cutils/bitops.h>
+
+namespace android_audio_legacy {
+    using android::Vector;
+    using android::String16;
+    using android::String8;
 
 // ----------------------------------------------------------------------------
 
@@ -62,7 +69,7 @@ public:
     /**
      * return the frame size (number of bytes per sample).
      */
-    uint32_t    frameSize() const { return AudioSystem::popCount(channels())*((format()==AudioSystem::PCM_16_BIT)?sizeof(int16_t):sizeof(int8_t)); }
+    uint32_t    frameSize() const { return popcount(channels())*((format()==AUDIO_FORMAT_PCM_16_BIT)?sizeof(int16_t):sizeof(int8_t)); }
 
     /**
      * return the audio hardware driver latency in milli seconds.