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

Unified Diff: webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m

Issue 1690313002: Update iOS AppRTCDemo to use the updated Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update Mac demo and other changes after updating against master Created 4 years, 10 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/examples/objc/AppRTCDemo/ARDSignalingMessage.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m b/webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m
index 6a8d37fbedc6d9ac9c344d44597ad376d08576e1..4d7552bfdafab1ece874d3b56f1b1773fe407fa4 100644
--- a/webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m
+++ b/webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m
@@ -10,10 +10,10 @@
#import "ARDSignalingMessage.h"
-#import "RTCLogging.h"
+#import "webrtc/base/objc/RTCLogging.h"
#import "ARDUtilities.h"
-#import "RTCICECandidate+JSON.h"
+#import "RTCIceCandidate+JSON.h"
#import "RTCSessionDescription+JSON.h"
static NSString const *kARDSignalingMessageTypeKey = @"type";
@@ -44,8 +44,8 @@ static NSString const *kARDSignalingMessageTypeKey = @"type";
NSString *typeString = values[kARDSignalingMessageTypeKey];
ARDSignalingMessage *message = nil;
if ([typeString isEqualToString:@"candidate"]) {
- RTCICECandidate *candidate =
- [RTCICECandidate candidateFromJSONDictionary:values];
+ RTCIceCandidate *candidate =
+ [RTCIceCandidate candidateFromJSONDictionary:values];
message = [[ARDICECandidateMessage alloc] initWithCandidate:candidate];
} else if ([typeString isEqualToString:@"offer"] ||
[typeString isEqualToString:@"answer"]) {
@@ -71,7 +71,7 @@ static NSString const *kARDSignalingMessageTypeKey = @"type";
@synthesize candidate = _candidate;
-- (instancetype)initWithCandidate:(RTCICECandidate *)candidate {
+- (instancetype)initWithCandidate:(RTCIceCandidate *)candidate {
if (self = [super initWithType:kARDSignalingMessageTypeCandidate]) {
_candidate = candidate;
}
@@ -89,16 +89,17 @@ static NSString const *kARDSignalingMessageTypeKey = @"type";
@synthesize sessionDescription = _sessionDescription;
- (instancetype)initWithDescription:(RTCSessionDescription *)description {
- ARDSignalingMessageType type = kARDSignalingMessageTypeOffer;
- NSString *typeString = description.type;
- if ([typeString isEqualToString:@"offer"]) {
- type = kARDSignalingMessageTypeOffer;
- } else if ([typeString isEqualToString:@"answer"]) {
- type = kARDSignalingMessageTypeAnswer;
+ ARDSignalingMessageType messageType = kARDSignalingMessageTypeOffer;
+ RTCSdpType type = description.type;
tkchin_webrtc 2016/03/08 19:51:21 nit: sdpType
tkchin_webrtc 2016/03/08 19:51:21 now that it's an enum use a switch, and let the ba
hjon_webrtc 2016/03/10 03:32:43 Done.
hjon_webrtc 2016/03/10 03:32:43 Done.
+ if (type == RTCSdpTypeOffer) {
+ messageType = kARDSignalingMessageTypeOffer;
+ } else if (type == RTCSdpTypeAnswer) {
+ messageType = kARDSignalingMessageTypeAnswer;
} else {
- NSAssert(NO, @"Unexpected type: %@", typeString);
+ NSAssert(NO, @"Unexpected type: %@",
+ [RTCSessionDescription stringForType:type]);
}
- if (self = [super initWithType:type]) {
+ if (self = [super initWithType:messageType]) {
_sessionDescription = description;
}
return self;

Powered by Google App Engine
This is Rietveld 408576698