Merge "Audio effects: modified command() parameter types." into gingerbread (62d83a0c) · Commits · e / os / android_frameworks_base

include/media/AudioEffect.h

+11 −7

Original line number	Diff line number	Diff line
		@@ -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();

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;
		};

		// ----------------------------------------------------------------------------

+5 −2

Original line number	Diff line number	Diff line
		@@ -698,8 +698,11 @@ static jint android_media_AudioEffect_native_command(JNIEnv *env, jobject thiz,
		}
		}

		lStatus = translateError(lpAudioEffect->command(cmdCode, cmdSize, pCmdData,
		pReplySize, pReplyData));
		lStatus = translateError(lpAudioEffect->command((uint32_t)cmdCode,
		(uint32_t)cmdSize,
		pCmdData,
		(uint32_t *)pReplySize,
		pReplyData));

		command_Exit: