diff options
| author | Andreas Huber <andih@google.com> | 2009-12-17 10:23:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:23:46 -0800 |
| commit | b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb (patch) | |
| tree | 345a2a58b9f210483ab60f259c682b6b7362e3d5 /include | |
| parent | 0249c83ed014cc6a36caac30e55db62c29c204e2 (diff) | |
| parent | 082e51712ab9c9ce94eaee88797bbdbc80b2004d (diff) | |
| download | frameworks_base-b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb.zip frameworks_base-b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb.tar.gz frameworks_base-b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb.tar.bz2 | |
am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp
* commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d':
Squashed commit of the following:
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 6f3ba1c..39bd5b1 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -42,7 +42,11 @@ public: typedef void *buffer_id; typedef void *node_id; - virtual status_t listNodes(List<String8> *list) = 0; + struct ComponentInfo { + String8 mName; + List<String8> mRoles; + }; + virtual status_t listNodes(List<ComponentInfo> *list) = 0; virtual status_t allocateNode( const char *name, const sp<IOMXObserver> &observer, |