generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building errors on window which caused by previous cl

Browse Source 
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
This commit is contained in:
leozwang@webrtc.org
2012-03-01 19:57:13 +00:00
parent 09e771998c
commit 4add6bc603
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc
View File

@@ -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));

4
src/modules/video_capture/main/source/Windows/video_capture_windows.cc
View File

@@ -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)

2
src/modules/video_capture/main/source/Windows/video_capture_windows.h
View File

@@ -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);
/*************************************************************************
*