Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(548)

Unified Diff: media/video/capture/mac/video_capture_device_qtkit_mac.mm

Issue 10198016: Fix TODO comments for the mac media capture part (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix camelcase style issues Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/video/capture/mac/video_capture_device_qtkit_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 efbee0fd08a36ac19dc42a74155fb423bc30f5f1..f909bdaba42d65269db56acbc589be2d4c5ccb91 100644
--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm
+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
@@ -14,8 +14,18 @@
#pragma mark Class methods
-+ (NSArray *)deviceNames {
- return [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo];
++ (NSDictionary *)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];
+ }
+ return deviceNames;
}
#pragma mark Public methods
« no previous file with comments | « media/video/capture/mac/video_capture_device_qtkit_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698