| Index: talk/app/webrtc/objc/RTCVideoCapturer.mm
|
| diff --git a/talk/app/webrtc/objc/RTCVideoCapturer.mm b/talk/app/webrtc/objc/RTCVideoCapturer.mm
|
| index 2ce01f53a360e913f41a198c0a297768f2a9cb70..52119ce47840f3c4fbd2cc1a09f32c1f78f47058 100644
|
| --- a/talk/app/webrtc/objc/RTCVideoCapturer.mm
|
| +++ b/talk/app/webrtc/objc/RTCVideoCapturer.mm
|
| @@ -32,30 +32,11 @@
|
| #import "RTCVideoCapturer+Internal.h"
|
|
|
| #include "webrtc/media/base/videocapturer.h"
|
| -#include "webrtc/media/devices/devicemanager.h"
|
|
|
| @implementation RTCVideoCapturer {
|
| rtc::scoped_ptr<cricket::VideoCapturer> _capturer;
|
| }
|
|
|
| -+ (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName {
|
| - const std::string& device_name = std::string([deviceName UTF8String]);
|
| - rtc::scoped_ptr<cricket::DeviceManagerInterface> device_manager(
|
| - cricket::DeviceManagerFactory::Create());
|
| - bool initialized = device_manager->Init();
|
| - NSAssert(initialized, @"DeviceManager::Init() failed");
|
| - cricket::Device device;
|
| - if (!device_manager->GetVideoCaptureDevice(device_name, &device)) {
|
| - LOG(LS_ERROR) << "GetVideoCaptureDevice failed";
|
| - return 0;
|
| - }
|
| - rtc::scoped_ptr<cricket::VideoCapturer> capturer(
|
| - device_manager->CreateVideoCapturer(device));
|
| - RTCVideoCapturer* rtcCapturer =
|
| - [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()];
|
| - return rtcCapturer;
|
| -}
|
| -
|
| @end
|
|
|
| @implementation RTCVideoCapturer (Internal)
|
|
|