diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-19 02:34:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 02:34:33 +0000 |
| commit | 0951ed3cd4fd322453d5c9619e5089c9b620a7ae (patch) | |
| tree | a67743f1c675b3115bc7694fee6e5f5aa0714174 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 642025caee4b7917ca261ef65168c602d1e20630 (diff) | |
| parent | dae9df0a67acae245a81a8a1404b14044eb5f5b4 (diff) | |
| download | frameworks_av-0951ed3cd4fd322453d5c9619e5089c9b620a7ae.zip frameworks_av-0951ed3cd4fd322453d5c9619e5089c9b620a7ae.tar.gz frameworks_av-0951ed3cd4fd322453d5c9619e5089c9b620a7ae.tar.bz2 | |
am dae9df0a: am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-dev
* commit 'dae9df0a67acae245a81a8a1404b14044eb5f5b4':
Don't autoloop notifications
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 39b2287..de16ec9 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -636,6 +636,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); |