summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-03-19 21:57:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-19 21:57:42 +0000
commitd4a31b8bcd7df99dfce2f25a32badf4611a6ba1a (patch)
treea910c51ee1fdd3b8bc14f822da70b3136f8b50a8 /media/libmedia
parent259ace8f6057dbb0fdec4c8223aefc0282274be3 (diff)
parentde9453fb5cbc9cd69fd1ea45d577851e3aa3b8c9 (diff)
downloadframeworks_av-d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a.zip
frameworks_av-d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a.tar.gz
frameworks_av-d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a.tar.bz2
Merge "Add MediaPlayer::getAudioStreamType."
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/mediaplayer.cpp8
1 files changed, 8 insertions, 0 deletions
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");