diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 16:38:12 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-13 10:20:14 -0800 |
| commit | fff6d715a8db0daf08a50634f242c40268de3d49 (patch) | |
| tree | f5331971b746b2e0d878e1127003a0dab72e5fbb /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | 09192653e836b21689f004bf8dee375356641181 (diff) | |
| download | frameworks_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/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 66f245d..6b68b87 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -92,7 +92,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual void flush(); virtual void pause(); virtual void close(); - void setAudioStreamType(int streamType) { mStreamType = streamType; } + void setAudioStreamType(audio_stream_type_t streamType) { mStreamType = streamType; } void setVolume(float left, float right); status_t setAuxEffectSendLevel(float level); status_t attachAuxEffect(int effectId); @@ -108,7 +108,7 @@ class MediaPlayerService : public BnMediaPlayerService AudioTrack* mTrack; AudioCallback mCallback; void * mCallbackCookie; - int mStreamType; + audio_stream_type_t mStreamType; float mLeftVolume; float mRightVolume; float mMsecsPerFrame; @@ -149,7 +149,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual void flush() {} virtual void pause() {} virtual void close() {} - void setAudioStreamType(int streamType) {} + void setAudioStreamType(audio_stream_type_t streamType) {} void setVolume(float left, float right) {} uint32_t sampleRate() const { return mSampleRate; } audio_format_t format() const { return mFormat; } @@ -259,7 +259,7 @@ private: virtual status_t getCurrentPosition(int* msec); virtual status_t getDuration(int* msec); virtual status_t reset(); - virtual status_t setAudioStreamType(int type); + virtual status_t setAudioStreamType(audio_stream_type_t type); virtual status_t setLooping(int loop); virtual status_t setVolume(float leftVolume, float rightVolume); virtual status_t invoke(const Parcel& request, Parcel *reply); |