From 7bd3d7d19670932f9edcb637d30d6b141ab8b51a Mon Sep 17 00:00:00 2001 From: Nicolas Catania Date: Wed, 10 Mar 2010 10:41:04 -0800 Subject: Allow invoke in all the player states except idle and error. Previously invoke would work only after prepare but not when the player is in play or pause state (for instance). This new change just check that the player has been initialized and is not in the error state. Bug:2488931 Change-Id: I9b9f3679593a3b7697c1a84d993fdcd7e1693a90 --- media/libmedia/mediaplayer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'media/libmedia/mediaplayer.cpp') diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index f623295be76e..c6bbbcc9cf2d 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -159,8 +159,10 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length) status_t MediaPlayer::invoke(const Parcel& request, Parcel *reply) { Mutex::Autolock _l(mLock); - if ((mPlayer != NULL) && ( mCurrentState & MEDIA_PLAYER_INITIALIZED )) - { + const bool hasBeenInitialized = + (mCurrentState != MEDIA_PLAYER_STATE_ERROR) && + ((mCurrentState & MEDIA_PLAYER_IDLE) != MEDIA_PLAYER_IDLE); + if ((mPlayer != NULL) && hasBeenInitialized) { LOGV("invoke %d", request.dataSize()); return mPlayer->invoke(request, reply); } -- cgit v1.2.3-59-g8ed1b