merge in jb-mr1-release history after reset to jb-mr1-dev

[android-x86/hardware-libhardware_legacy.git] / audio / AudioHardwareInterface.cpp

diff --git a/audio/AudioHardwareInterface.cpp b/audio/AudioHardwareInterface.cpp
index 31f25b6..60cce27 100644 (file)
--- a/audio/AudioHardwareInterface.cpp
+++ b/audio/AudioHardwareInterface.cpp
@@ -26,9 +26,6 @@
 
 #include "AudioHardwareStub.h"
 #include "AudioHardwareGeneric.h"
-#ifdef WITH_A2DP
-#include "A2dpAudioInterface.h"
-#endif
 
 #ifdef ENABLE_AUDIO_DUMP
 #include "AudioDumpInterface.h"
@@ -73,6 +70,12 @@ AudioStreamOut::~AudioStreamOut()
 {
 }
 
+// default implementation is unsupported
+status_t AudioStreamOut::getNextWriteTimestamp(int64_t *timestamp)
+{
+    return INVALID_OPERATION;
+}
+
 AudioStreamIn::~AudioStreamIn() {}
 
 AudioHardwareBase::AudioHardwareBase()
@@ -125,6 +128,12 @@ size_t AudioHardwareBase::getInputBufferSize(uint32_t sampleRate, int format, in
     return 320;
 }
 
+// default implementation is unsupported
+status_t AudioHardwareBase::getMasterVolume(float *volume)
+{
+    return INVALID_OPERATION;
+}
+
 status_t AudioHardwareBase::dumpState(int fd, const Vector<String16>& args)
 {
     const size_t SIZE = 256;