summaryrefslogtreecommitdiffstats
path: root/include/media/mediaplayer.h
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 /include/media/mediaplayer.h
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 'include/media/mediaplayer.h')
-rw-r--r--include/media/mediaplayer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index 2dc055e..00b7dd5 100644
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -185,7 +185,7 @@ public:
status_t getCurrentPosition(int *msec);
status_t getDuration(int *msec);
status_t reset();
- status_t setAudioStreamType(int type);
+ status_t setAudioStreamType(audio_stream_type_t type);
status_t setLooping(int loop);
bool isLooping();
status_t setVolume(float leftVolume, float rightVolume);
@@ -223,7 +223,7 @@ private:
int mSeekPosition;
bool mPrepareSync;
status_t mPrepareStatus;
- int mStreamType;
+ audio_stream_type_t mStreamType;
bool mLoop;
float mLeftVolume;
float mRightVolume;