Chromium Code Reviews| Index: webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm |
| diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm |
| index d3f2188bae6923ef5e8c7c7cbb30a26623cd3bb6..072b0f68ec6abe09875cf94a442fb5ee09b8e84c 100644 |
| --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm |
| +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm |
| @@ -60,10 +60,12 @@ using namespace webrtc; |
| { |
| NSString* strTitle = [NSString stringWithFormat:@"%s", dialogTitleUTF8]; |
| NSString* strButton = @"Alright"; |
| - NSAlert* alert = [NSAlert alertWithMessageText:strTitle |
| - defaultButton:strButton |
| - alternateButton:nil otherButton:nil |
| - informativeTextWithFormat:@"Device %s is capturing", deviceUniqueIdUTF8]; |
| + NSAlert* alert = [[NSAlert alloc] init]; |
|
tkchin_webrtc
2016/01/28 21:09:44
QTKit! We should remove it altogether at some poin
hjon_webrtc
2016/01/28 23:49:51
Acknowledged.
|
| + alert.messageText = strTitle; |
| + [alert addButtonWithTitle:strButton]; |
| + alert.informativeText = |
| + [NSString stringWithFormat:@"Device %s is capturing", |
| + deviceUniqueIdUTF8]; |
| [alert setAlertStyle:NSInformationalAlertStyle]; |
| [alert runModal]; |
| return [NSNumber numberWithInt:0]; |
| @@ -105,6 +107,8 @@ using namespace webrtc; |
| bool successful = NO; |
| + #pragma clang diagnostic push |
| + #pragma clang diagnostic ignored "-Wdeprecated" |
| NSString* tempString = [tempCaptureDevice localizedDisplayName]; |
| successful = [tempString getCString:(char*)deviceName |
| maxLength:deviceNameLength encoding:NSUTF8StringEncoding]; |
| @@ -122,6 +126,7 @@ using namespace webrtc; |
| memset(deviceUniqueID, 0, deviceNameLength); |
| return [NSNumber numberWithInt:-1]; |
| } |
| + #pragma clang diagnostic pop |
| return [NSNumber numberWithInt:0]; |
| @@ -179,9 +184,12 @@ using namespace webrtc; |
| { |
| [_captureDevicesInfo release]; |
| } |
| + #pragma clang diagnostic push |
| + #pragma clang diagnostic ignored "-Wdeprecated" |
| _captureDevicesInfo = [[NSArray alloc] |
| initWithArray:[QTCaptureDevice |
| inputDevicesWithMediaType:QTMediaTypeVideo]]; |
| + #pragma clang diagnostic pop |
| _captureDeviceCountInfo = _captureDevicesInfo.count; |