Chromium Code Reviews| Index: media/video/capture/mac/video_capture_device_qtkit_mac.mm |
| diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm |
| index c2d2b06ff538bafe9c3a4eb036ca8c12849ebb56..712c5fa5e6ed60b29f92a896a720613b43dbb442 100644 |
| --- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm |
| +++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm |
| @@ -15,17 +15,25 @@ |
| #pragma mark Class methods |
| -+ (NSDictionary *)deviceNames { |
| ++ (void)getDeviceNames:(NSMutableDictionary*)deviceNames { |
| NSArray *captureDevices = |
| [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; |
| - NSMutableDictionary *deviceNames = |
| - [[[NSMutableDictionary alloc] init] autorelease]; |
| for (QTCaptureDevice* device in captureDevices) { |
| - NSString* qtDeviceName = [device localizedDisplayName]; |
| - NSString* qtUniqueId = [device uniqueID]; |
| - [deviceNames setObject:qtDeviceName forKey:qtUniqueId]; |
| + [deviceNames setObject:[device localizedDisplayName] |
| + forKey:[device uniqueID]]; |
| } |
| +} |
| + |
| ++ (NSDictionary *)deviceNames { |
|
sail
2012/10/09 23:53:39
no space before *
|
| + NSMutableDictionary *deviceNames = |
| + [[[NSMutableDictionary alloc] init] autorelease]; |
| + |
| + // TODO(shess): Post to the main thread to see if that helps |
| + // http://crbug.com/139164 |
| + [self performSelectorOnMainThread:@selector(getDeviceNames:) |
| + withObject:deviceNames |
| + waitUntilDone:YES]; |
| return deviceNames; |
| } |