diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-17 11:32:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-17 11:32:53 -0800 |
| commit | 0696400a6bb9abbed62b3b9c6aa105495dc600a2 (patch) | |
| tree | 2368d7ccb33fbceb99585839b85420e38e59abf0 /media/libmedia | |
| parent | a9b21c5a7c24fe14d20372263c0bf5faf3d3e348 (diff) | |
| parent | f78aee70d15daf4690de7e7b4983ee68b0d1381d (diff) | |
| download | frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.zip frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.tar.gz frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.tar.bz2 | |
Merge "Use audio_mode_t consistently"
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 5193848..e537e5a 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -156,7 +156,7 @@ status_t AudioSystem::getStreamMute(audio_stream_type_t stream, bool* mute) return NO_ERROR; } -status_t AudioSystem::setMode(int mode) +status_t AudioSystem::setMode(audio_mode_t mode) { if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE; const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); @@ -536,7 +536,7 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d return aps->getDeviceConnectionState(device, device_address); } -status_t AudioSystem::setPhoneState(int state) +status_t AudioSystem::setPhoneState(audio_mode_t state) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return PERMISSION_DENIED; diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 9ed1a2a..eef551c 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -289,7 +289,7 @@ public: return reply.readInt32(); } - virtual status_t setMode(int mode) + virtual status_t setMode(audio_mode_t mode) { Parcel data, reply; data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor()); @@ -786,7 +786,7 @@ status_t BnAudioFlinger::onTransact( } break; case SET_MODE: { CHECK_INTERFACE(IAudioFlinger, data, reply); - int mode = data.readInt32(); + audio_mode_t mode = (audio_mode_t) data.readInt32(); reply->writeInt32( setMode(mode) ); return NO_ERROR; } break; diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 67d9c45..645325b 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -91,7 +91,7 @@ public: return static_cast <audio_policy_dev_state_t>(reply.readInt32()); } - virtual status_t setPhoneState(int state) + virtual status_t setPhoneState(audio_mode_t state) { Parcel data, reply; data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor()); @@ -394,7 +394,7 @@ status_t BnAudioPolicyService::onTransact( case SET_PHONE_STATE: { CHECK_INTERFACE(IAudioPolicyService, data, reply); - reply->writeInt32(static_cast <uint32_t>(setPhoneState(data.readInt32()))); + reply->writeInt32(static_cast <uint32_t>(setPhoneState((audio_mode_t) data.readInt32()))); return NO_ERROR; } break; |