diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-19 01:21:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-19 01:21:51 +0000 |
| commit | ba0790bf10da74caacb214ea8155d172bae4d0c5 (patch) | |
| tree | 8d2be0704e909f73cb00e80d01fd4ede48a00f15 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 993d57ec4817922e291e2d88d690559403a1bcd6 (diff) | |
| parent | 707eadef2ad1388bafdb2d003a4169208fa99811 (diff) | |
| download | frameworks_av-ba0790bf10da74caacb214ea8155d172bae4d0c5.zip frameworks_av-ba0790bf10da74caacb214ea8155d172bae4d0c5.tar.gz frameworks_av-ba0790bf10da74caacb214ea8155d172bae4d0c5.tar.bz2 | |
Merge "Don't autoloop notifications" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 5ceddc7..e09567a 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -628,6 +628,16 @@ void NuPlayerDriver::notifyListener_l( case MEDIA_PLAYBACK_COMPLETE: { if (mState != STATE_RESET_IN_PROGRESS) { + 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 && (mAudioSink == NULL || mAudioSink->realtime()))) { mPlayer->seekToAsync(0); |