diff options
| author | Dima Zavin <dima@android.com> | 2011-04-19 22:30:36 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-04-27 13:10:10 -0700 |
| commit | 24fc2fb1c541e954b83fd31ea9f786a5e9b45501 (patch) | |
| tree | e85b3ff86b73d56e16ab640919d251c046371c65 /media/libmedia/mediaplayer.cpp | |
| parent | 4dc22e77cfd2a1c3671e5646ee87c5e4c15596a0 (diff) | |
| download | frameworks_base-24fc2fb1c541e954b83fd31ea9f786a5e9b45501.zip frameworks_base-24fc2fb1c541e954b83fd31ea9f786a5e9b45501.tar.gz frameworks_base-24fc2fb1c541e954b83fd31ea9f786a5e9b45501.tar.bz2 | |
audio/media: convert to using the audio HAL and new audio defs
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index e80e742..9daa80f 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -37,6 +37,8 @@ #include <utils/KeyedVector.h> #include <utils/String8.h> +#include <hardware/audio.h> + namespace android { MediaPlayer::MediaPlayer() @@ -45,7 +47,7 @@ MediaPlayer::MediaPlayer() mListener = NULL; mCookie = NULL; mDuration = -1; - mStreamType = AudioSystem::MUSIC; + mStreamType = AUDIO_STREAM_MUSIC; mCurrentPosition = -1; mSeekPosition = -1; mCurrentState = MEDIA_PLAYER_IDLE; |