summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediaplayer.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-12 16:38:12 -0800
committerGlenn Kasten <gkasten@google.com>2012-01-13 10:20:14 -0800
commitfff6d715a8db0daf08a50634f242c40268de3d49 (patch)
treef5331971b746b2e0d878e1127003a0dab72e5fbb /media/libmedia/mediaplayer.cpp
parent09192653e836b21689f004bf8dee375356641181 (diff)
downloadframeworks_av-fff6d715a8db0daf08a50634f242c40268de3d49.zip
frameworks_av-fff6d715a8db0daf08a50634f242c40268de3d49.tar.gz
frameworks_av-fff6d715a8db0daf08a50634f242c40268de3d49.tar.bz2
Use audio_stream_type_t consistently
At native level it was a mixture of audio_stream_type_t, int, uint32_t, and uint8_t. Java is still int. Also fixed a couple of hard-coded -1 instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0 instead of AUDIO_STREAM_VOICE_CALL. Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
-rw-r--r--media/libmedia/mediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 4be960c..acf97a6 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -478,7 +478,7 @@ status_t MediaPlayer::reset()
return reset_l();
}
-status_t MediaPlayer::setAudioStreamType(int type)
+status_t MediaPlayer::setAudioStreamType(audio_stream_type_t type)
{
ALOGV("MediaPlayer::setAudioStreamType");
Mutex::Autolock _l(mLock);