From 4add6bc603cffb6d8e29bac80a1f739b56239b02 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Thu, 1 Mar 2012 19:57:13 +0000 Subject: [PATCH] Fix building errors on window which caused by previous cl BUG=311 TBR=Wu, Mallinath Review URL: https://webrtc-codereview.appspot.com/432002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1818 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/Windows/video_capture_factory_windows.cc | 4 ++-- .../main/source/Windows/video_capture_windows.cc | 4 ++-- .../video_capture/main/source/Windows/video_capture_windows.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc b/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc index bfc7a30f13..13820d6d7a 100644 --- a/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc +++ b/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc @@ -18,7 +18,7 @@ namespace videocapturemodule { VideoCaptureModule* VideoCaptureImpl::Create( const WebRtc_Word32 id, - const WebRtc_UWord8* deviceUniqueIdUTF8) + const char* deviceUniqueIdUTF8) { if (deviceUniqueIdUTF8 == NULL) @@ -26,7 +26,7 @@ VideoCaptureModule* VideoCaptureImpl::Create( return NULL; } - WebRtc_UWord8 productId[kVideoCaptureProductIdLength]; + char productId[kVideoCaptureProductIdLength]; videocapturemodule::DeviceInfoWindows::GetProductId(deviceUniqueIdUTF8, productId, sizeof(productId)); diff --git a/src/modules/video_capture/main/source/Windows/video_capture_windows.cc b/src/modules/video_capture/main/source/Windows/video_capture_windows.cc index 889b7ef835..64091a4139 100644 --- a/src/modules/video_capture/main/source/Windows/video_capture_windows.cc +++ b/src/modules/video_capture/main/source/Windows/video_capture_windows.cc @@ -60,7 +60,7 @@ VideoCaptureDS::~VideoCaptureDS() } WebRtc_Word32 VideoCaptureDS::Init(const WebRtc_Word32 id, - const WebRtc_UWord8* deviceUniqueIdUTF8) + const char* deviceUniqueIdUTF8) { WebRtc_Word32 result = 0; @@ -70,7 +70,7 @@ WebRtc_Word32 VideoCaptureDS::Init(const WebRtc_Word32 id, return -1; // Store the device name - _deviceUniqueId = new (std::nothrow) WebRtc_UWord8[nameLength + 1]; + _deviceUniqueId = new (std::nothrow) char[nameLength + 1]; memcpy(_deviceUniqueId, deviceUniqueIdUTF8, nameLength + 1); if (_dsInfo.Init() != 0) diff --git a/src/modules/video_capture/main/source/Windows/video_capture_windows.h b/src/modules/video_capture/main/source/Windows/video_capture_windows.h index 69e2db5fa3..a888a9faf8 100644 --- a/src/modules/video_capture/main/source/Windows/video_capture_windows.h +++ b/src/modules/video_capture/main/source/Windows/video_capture_windows.h @@ -36,7 +36,7 @@ public: VideoCaptureDS(const WebRtc_Word32 id); virtual WebRtc_Word32 Init(const WebRtc_Word32 id, - const WebRtc_UWord8* deviceUniqueIdUTF8); + const char* deviceUniqueIdUTF8); /************************************************************************* *