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 | 41760137878022ae1788d3893f8c1ce60ee54971 (patch) | |
| tree | e9cd7431baa78d63c223ac232232e99e7a834f6a /include | |
| parent | 91da03b86ff9973af59ba4d64fee1fa89d9d0662 (diff) | |
| parent | 134ee6a324c35f39e3576172e4eae4c6de6eb9dc (diff) | |
| download | frameworks_av-41760137878022ae1788d3893f8c1ce60ee54971.zip frameworks_av-41760137878022ae1788d3893f8c1ce60ee54971.tar.gz frameworks_av-41760137878022ae1788d3893f8c1ce60ee54971.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, |