diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-28 07:51:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 07:51:02 -0700 |
| commit | 6fa8888254deb4961dc64c6ac03dc103c9cd8bcf (patch) | |
| tree | e4e49810a908482ccd6d3dca1e7cfea6d0baa87b /include/media | |
| parent | d5786b982c90632a4b35fd2d984c4edc4bbdfb0b (diff) | |
| parent | 62d83a0c894b72d9abda1340d278d2aeec11e0fb (diff) | |
| download | frameworks_base-6fa8888254deb4961dc64c6ac03dc103c9cd8bcf.zip frameworks_base-6fa8888254deb4961dc64c6ac03dc103c9cd8bcf.tar.gz frameworks_base-6fa8888254deb4961dc64c6ac03dc103c9cd8bcf.tar.bz2 | |
am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp
* commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb':
Audio effects: modified command() parameter types.
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioEffect.h | 18 | ||||
| -rw-r--r-- | include/media/EffectApi.h | 6 | ||||
| -rw-r--r-- | include/media/IEffect.h | 6 | ||||
| -rw-r--r-- | include/media/IEffectClient.h | 6 |
4 files changed, 24 insertions, 12 deletions
diff --git a/include/media/AudioEffect.h b/include/media/AudioEffect.h index e9ff8a3..c967efb 100644 --- a/include/media/AudioEffect.h +++ b/include/media/AudioEffect.h @@ -382,10 +382,10 @@ public: * See EffectApi.h for details on effect command() function, valid command codes * and formats. */ - virtual status_t command(int32_t cmdCode, - int32_t cmdSize, + virtual status_t command(uint32_t cmdCode, + uint32_t cmdSize, void *cmdData, - int32_t *replySize, + uint32_t *replySize, void *replyData); @@ -429,10 +429,10 @@ private: virtual void enableStatusChanged(bool enabled) { mEffect->enableStatusChanged(enabled); } - virtual void commandExecuted(int cmdCode, - int cmdSize, + virtual void commandExecuted(uint32_t cmdCode, + uint32_t cmdSize, void *pCmdData, - int replySize, + uint32_t replySize, void *pReplyData) { mEffect->commandExecuted(cmdCode, cmdSize, pCmdData, replySize, pReplyData); } @@ -450,7 +450,11 @@ private: // IEffectClient void controlStatusChanged(bool controlGranted); void enableStatusChanged(bool enabled); - void commandExecuted(int cmdCode, int cmdSize, void *pCmdData, int replySize, void *pReplyData); + void commandExecuted(uint32_t cmdCode, + uint32_t cmdSize, + void *pCmdData, + uint32_t replySize, + void *pReplyData); void binderDied(); diff --git a/include/media/EffectApi.h b/include/media/EffectApi.h index 8c120e5..16fb43c 100644 --- a/include/media/EffectApi.h +++ b/include/media/EffectApi.h @@ -284,10 +284,10 @@ typedef int32_t (*effect_process_t)(effect_interface_t self, // //////////////////////////////////////////////////////////////////////////////// typedef int32_t (*effect_command_t)(effect_interface_t self, - int32_t cmdCode, - int32_t cmdSize, + uint32_t cmdCode, + uint32_t cmdSize, void *pCmdData, - int32_t *replySize, + uint32_t *replySize, void *pReplyData); diff --git a/include/media/IEffect.h b/include/media/IEffect.h index 6dad393..ff04869 100644 --- a/include/media/IEffect.h +++ b/include/media/IEffect.h @@ -33,7 +33,11 @@ public: virtual status_t disable() = 0; - virtual status_t command(int cmdCode, int cmdSize, void *pCmdData, int *pReplySize, void *pReplyData) = 0; + virtual status_t command(uint32_t cmdCode, + uint32_t cmdSize, + void *pCmdData, + uint32_t *pReplySize, + void *pReplyData) = 0; virtual void disconnect() = 0; diff --git a/include/media/IEffectClient.h b/include/media/IEffectClient.h index d22daf8..2f78c98 100644 --- a/include/media/IEffectClient.h +++ b/include/media/IEffectClient.h @@ -31,7 +31,11 @@ public: virtual void controlStatusChanged(bool controlGranted) = 0; virtual void enableStatusChanged(bool enabled) = 0; - virtual void commandExecuted(int cmdCode, int cmdSize, void *pCmdData, int replySize, void *pReplyData) = 0; + virtual void commandExecuted(uint32_t cmdCode, + uint32_t cmdSize, + void *pCmdData, + uint32_t replySize, + void *pReplyData) = 0; }; // ---------------------------------------------------------------------------- |