From 3a39230fdf6743b4ecee1f1025cd5dadd95acfc0 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 12 Mar 2012 21:03:38 +0000 Subject: [PATCH] Further cleanup WebRtc_Word8 in external video capture Review URL: https://webrtc-codereview.appspot.com/450003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1881 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/External/device_info_external.cc | 4 ++-- .../main/source/External/video_capture_external.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/video_capture/main/source/External/device_info_external.cc b/src/modules/video_capture/main/source/External/device_info_external.cc index dd37a5976a..ab70bdaa8b 100644 --- a/src/modules/video_capture/main/source/External/device_info_external.cc +++ b/src/modules/video_capture/main/source/External/device_info_external.cc @@ -23,8 +23,8 @@ class ExternalDeviceInfo : public DeviceInfoImpl { virtual ~ExternalDeviceInfo() {} virtual WebRtc_UWord32 NumberOfDevices() { return 0; } virtual WebRtc_Word32 DisplayCaptureSettingsDialogBox( - const WebRtc_UWord8* /*deviceUniqueIdUTF8*/, - const WebRtc_UWord8* /*dialogTitleUTF8*/, + const char* /*deviceUniqueIdUTF8*/, + const char* /*dialogTitleUTF8*/, void* /*parentWindow*/, WebRtc_UWord32 /*positionX*/, WebRtc_UWord32 /*positionY*/) { return -1; } diff --git a/src/modules/video_capture/main/source/External/video_capture_external.cc b/src/modules/video_capture/main/source/External/video_capture_external.cc index e8cbccba71..dcc59aa802 100644 --- a/src/modules/video_capture/main/source/External/video_capture_external.cc +++ b/src/modules/video_capture/main/source/External/video_capture_external.cc @@ -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 @@ -17,7 +17,7 @@ namespace videocapturemodule { VideoCaptureModule* VideoCaptureImpl::Create( const WebRtc_Word32 id, - const WebRtc_UWord8* deviceUniqueIdUTF8) { + const char* deviceUniqueIdUTF8) { RefCountImpl* implementation = new RefCountImpl(id); return implementation;