diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-19 21:57:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-19 21:57:42 +0000 |
| commit | d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a (patch) | |
| tree | a910c51ee1fdd3b8bc14f822da70b3136f8b50a8 | |
| parent | 259ace8f6057dbb0fdec4c8223aefc0282274be3 (diff) | |
| parent | de9453fb5cbc9cd69fd1ea45d577851e3aa3b8c9 (diff) | |
| download | frameworks_av-d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a.zip frameworks_av-d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a.tar.gz frameworks_av-d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a.tar.bz2 | |
Merge "Add MediaPlayer::getAudioStreamType."
| -rw-r--r-- | include/media/mediaplayer.h | 1 | ||||
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index f8e4e3b..3ca3095 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -223,6 +223,7 @@ public: status_t getDuration(int *msec); status_t reset(); status_t setAudioStreamType(audio_stream_type_t type); + status_t getAudioStreamType(audio_stream_type_t *type); status_t setLooping(int loop); bool isLooping(); status_t setVolume(float leftVolume, float rightVolume); diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index d94c7c5..0be01a9 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -531,6 +531,14 @@ status_t MediaPlayer::setAudioStreamType(audio_stream_type_t type) return OK; } +status_t MediaPlayer::getAudioStreamType(audio_stream_type_t *type) +{ + ALOGV("getAudioStreamType"); + Mutex::Autolock _l(mLock); + *type = mStreamType; + return OK; +} + status_t MediaPlayer::setLooping(int loop) { ALOGV("MediaPlayer::setLooping"); |