diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-19 06:10:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-19 06:10:37 -0800 |
| commit | 27a0d83f53ddbfd6449ab0e3c786742a2cd135a9 (patch) | |
| tree | 6bb67bb1bf2d9c069053a98a0a6d6a31bfa2fd02 /media | |
| parent | 241fc78866b2aefd75cd1890df5a75b7008728e8 (diff) | |
| parent | a3f1fa308728976fc9ca1b4f37d26e633b32b9ac (diff) | |
| download | frameworks_av-27a0d83f53ddbfd6449ab0e3c786742a2cd135a9.zip frameworks_av-27a0d83f53ddbfd6449ab0e3c786742a2cd135a9.tar.gz frameworks_av-27a0d83f53ddbfd6449ab0e3c786742a2cd135a9.tar.bz2 | |
Merge "Fix incorrect includes of AudioTrack.h"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MidiFile.h | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index acf97a6..f1c47dd 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -30,7 +30,7 @@ #include <gui/SurfaceTextureClient.h> #include <media/mediaplayer.h> -#include <media/AudioTrack.h> +#include <media/AudioSystem.h> #include <surfaceflinger/Surface.h> diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 6b68b87..fa71d11 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -34,6 +34,7 @@ namespace android { +class AudioTrack; class IMediaRecorder; class IMediaMetadataRetriever; class IOMX; diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index d219fc2..beda945 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -33,8 +33,6 @@ #include <utils/String16.h> -#include <media/AudioTrack.h> - #include <system/audio.h> #include "MediaRecorderClient.h" diff --git a/media/libmediaplayerservice/MidiFile.h b/media/libmediaplayerservice/MidiFile.h index dfe4318..f6f8f7b 100644 --- a/media/libmediaplayerservice/MidiFile.h +++ b/media/libmediaplayerservice/MidiFile.h @@ -19,7 +19,6 @@ #define ANDROID_MIDIFILE_H #include <media/MediaPlayerInterface.h> -#include <media/AudioTrack.h> #include <libsonivox/eas.h> namespace android { |