summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-02-09 17:46:37 -0800
committerMathias Agopian <mathias@google.com>2010-02-11 13:16:22 -0800
commit3cf613507f1e2f7bd932d921a6e222e426fd3be4 (patch)
tree20c9dd57e2227046ab1d6fc1185f4136c6dac12e /include/media
parent988e3f0b2c74095deae580157c57935a98573052 (diff)
downloadframeworks_av-3cf613507f1e2f7bd932d921a6e222e426fd3be4.zip
frameworks_av-3cf613507f1e2f7bd932d921a6e222e426fd3be4.tar.gz
frameworks_av-3cf613507f1e2f7bd932d921a6e222e426fd3be4.tar.bz2
split libsurfaceflinger_client and libcamera_client out of libui
Diffstat (limited to 'include/media')
-rw-r--r--include/media/MediaPlayerInterface.h3
-rw-r--r--include/media/mediaplayer.h3
-rw-r--r--include/media/stagefright/HardwareAPI.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h
index be06e33..ecb20e8 100644
--- a/include/media/MediaPlayerInterface.h
+++ b/include/media/MediaPlayerInterface.h
@@ -20,7 +20,6 @@
#ifdef __cplusplus
#include <sys/types.h>
-#include <ui/ISurface.h>
#include <utils/Errors.h>
#include <utils/KeyedVector.h>
#include <utils/String8.h>
@@ -33,6 +32,8 @@
namespace android {
class Parcel;
+class ISurface;
+
template<typename T> class SortedVector;
enum player_type {
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index c9198d6..8dc7c8a 100644
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -18,7 +18,6 @@
#define ANDROID_MEDIAPLAYER_H
#include <binder/IMemory.h>
-#include <ui/Surface.h>
#include <media/IMediaPlayerClient.h>
#include <media/IMediaPlayer.h>
#include <media/IMediaDeathNotifier.h>
@@ -28,6 +27,8 @@
namespace android {
+class Surface;
+
enum media_event_type {
MEDIA_NOP = 0, // interface test message
MEDIA_PREPARED = 1,
diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h
index b7daddc..221c679 100644
--- a/include/media/stagefright/HardwareAPI.h
+++ b/include/media/stagefright/HardwareAPI.h
@@ -20,7 +20,7 @@
#include <media/stagefright/OMXPluginBase.h>
#include <media/stagefright/VideoRenderer.h>
-#include <ui/ISurface.h>
+#include <surfaceflinger/ISurface.h>
#include <utils/RefBase.h>
#include <OMX_Component.h>