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

Unified Diff: webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm

Issue 1644843003: Compile rtc_base_objc and rtc_api_objc for Mac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add references to issues Created 4 years, 11 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
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..20cfed6a7c2fbb983767ea057e5efd699ede11f8 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];
+ 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,9 @@ using namespace webrtc;
bool successful = NO;
+// TODO(5478): Update deprecated APIs.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
NSString* tempString = [tempCaptureDevice localizedDisplayName];
successful = [tempString getCString:(char*)deviceName
maxLength:deviceNameLength encoding:NSUTF8StringEncoding];
@@ -122,6 +127,7 @@ using namespace webrtc;
memset(deviceUniqueID, 0, deviceNameLength);
return [NSNumber numberWithInt:-1];
}
+#pragma clang diagnostic pop
return [NSNumber numberWithInt:0];
@@ -179,9 +185,13 @@ using namespace webrtc;
{
[_captureDevicesInfo release];
}
+// TODO(5478): Update deprecated APIs.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
_captureDevicesInfo = [[NSArray alloc]
initWithArray:[QTCaptureDevice
inputDevicesWithMediaType:QTMediaTypeVideo]];
+#pragma clang diagnostic pop
_captureDeviceCountInfo = _captureDevicesInfo.count;

Powered by Google App Engine
This is Rietveld 408576698