diff options
| author | Marco Nelissen <marcone@google.com> | 2012-03-13 13:23:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-13 13:23:07 -0700 |
| commit | 36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab (patch) | |
| tree | eec0f805e2e83ed1d720519748527c03affafc29 /media/libmedia/mediaplayer.cpp | |
| parent | 5e7616cc0e5493241211333134555d74aec89982 (diff) | |
| parent | 6b74d671a1321a6ecc4a40b6c87beedfecc1ec44 (diff) | |
| download | frameworks_av-36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab.zip frameworks_av-36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab.tar.gz frameworks_av-36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab.tar.bz2 | |
Merge "Gapless playback, step 1."
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 7ea9490..b52a37d 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -788,4 +788,11 @@ void MediaPlayer::died() } +status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { + if (mPlayer == NULL) { + return NO_INIT; + } + return mPlayer->setNextPlayer(next == NULL ? NULL : next->mPlayer); +} + }; // namespace android |