Merge "Eliminate dependencies on hardware/audio.h (trivial cases)" (d3196abc) · Commits · e / os / android_frameworks_av

include/media/audiohal/DeviceHalInterface.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		#ifndef ANDROID_HARDWARE_DEVICE_HAL_INTERFACE_H
		#define ANDROID_HARDWARE_DEVICE_HAL_INTERFACE_H

		#include <hardware/audio.h>
		#include <system/audio.h>
		#include <utils/Errors.h>
		#include <utils/RefBase.h>
		#include <utils/String8.h>

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		#ifndef ANDROID_HARDWARE_STREAM_HAL_INTERFACE_H
		#define ANDROID_HARDWARE_STREAM_HAL_INTERFACE_H

		#include <hardware/audio.h>
		#include <media/audiohal/EffectHalInterface.h>
		#include <system/audio.h>
		#include <utils/Errors.h>
		#include <utils/RefBase.h>
		#include <utils/String8.h>
		@@ -117,7 +117,7 @@ class StreamOutHalInterface : public virtual StreamHalInterface {
		virtual status_t supportsDrain(bool *supportsDrain) = 0;

		// Requests notification when data buffered by the driver/hardware has been played.
		virtual status_t drain(audio_drain_type_t type) = 0;
		virtual status_t drain(bool earlyNotify) = 0;

		// Notifies to the audio driver to flush the queued data.
		virtual status_t flush() = 0;

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#ifndef ANDROID_AUDIO_STREAM_IN_SOURCE_H
		#define ANDROID_AUDIO_STREAM_IN_SOURCE_H

		#include <hardware/audio.h>
		#include "NBAIO.h"

		namespace android {

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#ifndef ANDROID_AUDIO_STREAM_OUT_SINK_H
		#define ANDROID_AUDIO_STREAM_OUT_SINK_H

		#include <hardware/audio.h>
		#include "NBAIO.h"

		namespace android {

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#ifndef ANDROID_HARDWARE_DEVICE_HAL_LOCAL_H
		#define ANDROID_HARDWARE_DEVICE_HAL_LOCAL_H

		#include <hardware/audio.h>
		#include <media/audiohal/DeviceHalInterface.h>

		namespace android {