diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-27 17:52:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-27 17:52:57 +0000 |
| commit | b955b7224382b488a4d8d5663c92118feb8deb1e (patch) | |
| tree | 30033d3aeffb55ee270e5cdb2711bdec28346f55 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 64b08d230c94872e014831bdb7b8a323c4b584ec (diff) | |
| parent | 47deb15e99cbf60e558027e074b7415c95637943 (diff) | |
| download | frameworks_av-b955b7224382b488a4d8d5663c92118feb8deb1e.zip frameworks_av-b955b7224382b488a4d8d5663c92118feb8deb1e.tar.gz frameworks_av-b955b7224382b488a4d8d5663c92118feb8deb1e.tar.bz2 | |
am 47deb15e: Merge "Remove MediaPlayerService::decode()"
* commit '47deb15e99cbf60e558027e074b7415c95637943':
Remove MediaPlayerService::decode()
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index ab46074..4febd6b 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -630,8 +630,17 @@ void NuPlayerDriver::notifyListener_l( case MEDIA_PLAYBACK_COMPLETE: { if (mState != STATE_RESET_IN_PROGRESS) { - if (mLooping || (mAutoLoop - && (mAudioSink == NULL || mAudioSink->realtime()))) { + if (mAutoLoop) { + audio_stream_type_t streamType = AUDIO_STREAM_MUSIC; + if (mAudioSink != NULL) { + streamType = mAudioSink->getAudioStreamType(); + } + if (streamType == AUDIO_STREAM_NOTIFICATION) { + ALOGW("disabling auto-loop for notification"); + mAutoLoop = false; + } + } + if (mLooping || mAutoLoop) { mPlayer->seekToAsync(0); break; } |