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/libmedia/IMediaPlayer.cpp | |
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/libmedia/IMediaPlayer.cpp')
-rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 9c1e6b7..64cc919 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -198,11 +198,11 @@ public: return reply.readInt32(); } - status_t setAudioStreamType(int type) + status_t setAudioStreamType(audio_stream_type_t stream) { Parcel data, reply; data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor()); - data.writeInt32(type); + data.writeInt32((int32_t) stream); remote()->transact(SET_AUDIO_STREAM_TYPE, data, &reply); return reply.readInt32(); } @@ -397,7 +397,7 @@ status_t BnMediaPlayer::onTransact( } break; case SET_AUDIO_STREAM_TYPE: { CHECK_INTERFACE(IMediaPlayer, data, reply); - reply->writeInt32(setAudioStreamType(data.readInt32())); + reply->writeInt32(setAudioStreamType((audio_stream_type_t) data.readInt32())); return NO_ERROR; } break; case SET_LOOPING: { |