drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Protect notification callback parameters with a mutex." into honeycomb

Browse Source
This commit is contained in:
Andreas Huber
2011-01-26 11:28:01 -08:00
committed by Android (Google) Code Review
parent 7765c65dbe 2ffbb18053
commit a9f27fa631
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/media/MediaPlayerInterface.h
View File

@ -126,8 +126,6 @@ public:
virtual status_t setLooping(int loop) = 0; virtual status_t setLooping(int loop) = 0;
virtual player_type playerType() = 0; virtual player_type playerType() = 0;
virtual void setNotifyCallback(void* cookie, notify_callback_f notifyFunc) {
mCookie = cookie; mNotify = notifyFunc; }
// Invoke a generic method on the player by using opaque parcels // Invoke a generic method on the player by using opaque parcels
// for the request and reply. // for the request and reply.
// //
@ -149,9 +147,21 @@ public:
return INVALID_OPERATION; return INVALID_OPERATION;
}; };
virtual void sendEvent(int msg, int ext1=0, int ext2=0) { if (mNotify) mNotify(mCookie, msg, ext1, ext2); } void setNotifyCallback(
void* cookie, notify_callback_f notifyFunc) {
Mutex::Autolock autoLock(mNotifyLock);
mCookie = cookie; mNotify = notifyFunc;
}
protected: void sendEvent(int msg, int ext1=0, int ext2=0) {
Mutex::Autolock autoLock(mNotifyLock);
if (mNotify) mNotify(mCookie, msg, ext1, ext2);
}
private:
friend class MediaPlayerService;
Mutex mNotifyLock;
void* mCookie; void* mCookie;
notify_callback_f mNotify; notify_callback_f mNotify;
}; };