diff options
-rw-r--r-- | include/media/IMediaPlayer.h | 2 | ||||
-rw-r--r-- | include/media/MediaPlayerInterface.h | 2 | ||||
-rw-r--r-- | include/media/mediaplayer.h | 2 | ||||
-rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 32 | ||||
-rw-r--r-- | media/libmedia/mediaplayer.cpp | 10 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 14 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 | ||||
-rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.cpp | 10 | ||||
-rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.h | 2 |
9 files changed, 0 insertions, 76 deletions
diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h index a1ce113..3d77278 100644 --- a/include/media/IMediaPlayer.h +++ b/include/media/IMediaPlayer.h @@ -48,8 +48,6 @@ public: virtual status_t setAudioStreamType(int type) = 0; virtual status_t setLooping(int loop) = 0; virtual status_t setVolume(float leftVolume, float rightVolume) = 0; - virtual status_t suspend() = 0; - virtual status_t resume() = 0; virtual status_t setAuxEffectSendLevel(float level) = 0; virtual status_t attachAuxEffect(int effectId) = 0; diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index eae0d7b..2d55a55 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -120,8 +120,6 @@ public: virtual status_t reset() = 0; virtual status_t setLooping(int loop) = 0; virtual player_type playerType() = 0; - virtual status_t suspend() { return INVALID_OPERATION; } - virtual status_t resume() { return INVALID_OPERATION; } virtual void setNotifyCallback(void* cookie, notify_callback_f notifyFunc) { mCookie = cookie; mNotify = notifyFunc; } diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 207191d..88b0c3e 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -169,8 +169,6 @@ public: status_t invoke(const Parcel& request, Parcel *reply); status_t setMetadataFilter(const Parcel& filter); status_t getMetadata(bool update_only, bool apply_filter, Parcel *metadata); - status_t suspend(); - status_t resume(); status_t setAudioSessionId(int sessionId); int getAudioSessionId(); status_t setAuxEffectSendLevel(float level); diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 9dfdcb0..1a46715 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -45,8 +45,6 @@ enum { INVOKE, SET_METADATA_FILTER, GET_METADATA, - SUSPEND, - RESUME, SET_AUX_EFFECT_SEND_LEVEL, ATTACH_AUX_EFFECT }; @@ -215,26 +213,6 @@ public: return reply->readInt32(); } - status_t suspend() { - Parcel request; - request.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor()); - - Parcel reply; - remote()->transact(SUSPEND, request, &reply); - - return reply.readInt32(); - } - - status_t resume() { - Parcel request; - request.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor()); - - Parcel reply; - remote()->transact(RESUME, request, &reply); - - return reply.readInt32(); - } - status_t setAuxEffectSendLevel(float level) { Parcel data, reply; @@ -358,16 +336,6 @@ status_t BnMediaPlayer::onTransact( reply->writeInt32(setMetadataFilter(data)); return NO_ERROR; } break; - case SUSPEND: { - CHECK_INTERFACE(IMediaPlayer, data, reply); - reply->writeInt32(suspend()); - return NO_ERROR; - } break; - case RESUME: { - CHECK_INTERFACE(IMediaPlayer, data, reply); - reply->writeInt32(resume()); - return NO_ERROR; - } break; case GET_METADATA: { CHECK_INTERFACE(IMediaPlayer, data, reply); const status_t retcode = getMetadata(data.readInt32(), data.readInt32(), reply); diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index ee3f660..34e41a1 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -172,16 +172,6 @@ status_t MediaPlayer::invoke(const Parcel& request, Parcel *reply) return INVALID_OPERATION; } -status_t MediaPlayer::suspend() { - Mutex::Autolock _l(mLock); - return mPlayer->suspend(); -} - -status_t MediaPlayer::resume() { - Mutex::Autolock _l(mLock); - return mPlayer->resume(); -} - status_t MediaPlayer::setMetadataFilter(const Parcel& filter) { LOGD("setMetadataFilter"); diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 80922d6..bb86e05 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -974,20 +974,6 @@ status_t MediaPlayerService::Client::getMetadata( return OK; } -status_t MediaPlayerService::Client::suspend() { - sp<MediaPlayerBase> p = getPlayer(); - if (p == 0) return UNKNOWN_ERROR; - - return p->suspend(); -} - -status_t MediaPlayerService::Client::resume() { - sp<MediaPlayerBase> p = getPlayer(); - if (p == 0) return UNKNOWN_ERROR; - - return p->resume(); -} - status_t MediaPlayerService::Client::prepareAsync() { LOGV("[%d] prepareAsync", mConnId); diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index c4e78f7..e197cde 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -225,8 +225,6 @@ private: virtual status_t getMetadata(bool update_only, bool apply_filter, Parcel *reply); - virtual status_t suspend(); - virtual status_t resume(); virtual status_t setAuxEffectSendLevel(float level); virtual status_t attachAuxEffect(int effectId); diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index b3e2da0..e0957f6 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.cpp +++ b/media/libmediaplayerservice/StagefrightPlayer.cpp @@ -147,16 +147,6 @@ player_type StagefrightPlayer::playerType() { return STAGEFRIGHT_PLAYER; } -status_t StagefrightPlayer::suspend() { - LOGV("suspend"); - return mPlayer->suspend(); -} - -status_t StagefrightPlayer::resume() { - LOGV("resume"); - return mPlayer->resume(); -} - status_t StagefrightPlayer::invoke(const Parcel &request, Parcel *reply) { return INVALID_OPERATION; } diff --git a/media/libmediaplayerservice/StagefrightPlayer.h b/media/libmediaplayerservice/StagefrightPlayer.h index dd37102..3899447 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.h +++ b/media/libmediaplayerservice/StagefrightPlayer.h @@ -51,8 +51,6 @@ public: virtual player_type playerType(); virtual status_t invoke(const Parcel &request, Parcel *reply); virtual void setAudioSink(const sp<AudioSink> &audioSink); - virtual status_t suspend(); - virtual status_t resume(); virtual status_t getMetadata( const media::Metadata::Filter& ids, Parcel *records); |