From 3e9e0f0497ee5b2e2e1e3587ee5376f8a43e9ddc Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 27 Feb 2012 19:17:38 +0000 Subject: [PATCH] Change WebRtc_Word8 to char Review URL: https://webrtc-codereview.appspot.com/405004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1776 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/android/audio_device_android_jni.cc | 8 ++++---- .../main/source/android/audio_device_android_jni.h | 10 +++++----- .../source/android/audio_device_android_opensles.cc | 8 ++++---- .../source/android/audio_device_android_opensles.h | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc b/src/modules/audio_device/main/source/android/audio_device_android_jni.cc index c55ca854e8..c275171baf 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc +++ b/src/modules/audio_device/main/source/android/audio_device_android_jni.cc @@ -1179,8 +1179,8 @@ WebRtc_Word32 AudioDeviceAndroidJni::SetPlayoutDevice( WebRtc_Word32 AudioDeviceAndroidJni::PlayoutDeviceName( WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]) + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) { if (0 != index) @@ -1207,8 +1207,8 @@ WebRtc_Word32 AudioDeviceAndroidJni::PlayoutDeviceName( WebRtc_Word32 AudioDeviceAndroidJni::RecordingDeviceName( WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]) + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) { if (0 != index) diff --git a/src/modules/audio_device/main/source/android/audio_device_android_jni.h b/src/modules/audio_device/main/source/android/audio_device_android_jni.h index f0ba70155f..e127e266eb 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_jni.h +++ b/src/modules/audio_device/main/source/android/audio_device_android_jni.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -55,12 +55,12 @@ public: virtual WebRtc_Word16 RecordingDevices(); virtual WebRtc_Word32 PlayoutDeviceName( WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]); + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]); virtual WebRtc_Word32 RecordingDeviceName( WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]); + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]); virtual WebRtc_Word32 SetPlayoutDevice(WebRtc_UWord16 index); virtual WebRtc_Word32 SetPlayoutDevice( diff --git a/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc b/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc index 8174e38fea..da88a0e8c3 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc +++ b/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc @@ -816,8 +816,8 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::SetPlayoutDevice( WebRtc_Word32 AudioDeviceAndroidOpenSLES::PlayoutDeviceName( WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]) { + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) { if (0 != index) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, @@ -837,8 +837,8 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::PlayoutDeviceName( WebRtc_Word32 AudioDeviceAndroidOpenSLES::RecordingDeviceName( WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]) { + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) { if (0 != index) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, diff --git a/src/modules/audio_device/main/source/android/audio_device_android_opensles.h b/src/modules/audio_device/main/source/android/audio_device_android_opensles.h index 54c44a142d..974ae90a61 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_opensles.h +++ b/src/modules/audio_device/main/source/android/audio_device_android_opensles.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -68,12 +68,12 @@ public: virtual WebRtc_Word16 RecordingDevices(); virtual WebRtc_Word32 PlayoutDeviceName(WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]); + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]); virtual WebRtc_Word32 RecordingDeviceName(WebRtc_UWord16 index, - WebRtc_Word8 name[kAdmMaxDeviceNameSize], - WebRtc_Word8 guid[kAdmMaxGuidSize]); + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]); // Device selection virtual WebRtc_Word32 SetPlayoutDevice(WebRtc_UWord16 index);