| 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..c9bc3f19b0a1b770c4d2aa8cb3f6444dec71be28 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,18 @@ 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;
|
| - } else {
|
| - NSAssert(NO, @"Unexpected type: %@", typeString);
|
| + ARDSignalingMessageType messageType = kARDSignalingMessageTypeOffer;
|
| + RTCSdpType sdpType = description.type;
|
| + switch (sdpType) {
|
| + case RTCSdpTypeOffer:
|
| + messageType = kARDSignalingMessageTypeOffer;
|
| + case RTCSdpTypeAnswer:
|
| + messageType = kARDSignalingMessageTypeAnswer;
|
| + case RTCSdpTypePrAnswer:
|
| + NSAssert(NO, @"Unexpected type: %@",
|
| + [RTCSessionDescription stringForType:sdpType]);
|
| }
|
| - if (self = [super initWithType:type]) {
|
| + if (self = [super initWithType:messageType]) {
|
| _sessionDescription = description;
|
| }
|
| return self;
|
|
|