Index: webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m |
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m b/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m |
index 51290a05b585bed47fe4074f17bf80b0cbec5026..4f9d937c77275daa767f82511a6a269d880b9402 100644 |
--- a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m |
+++ b/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m |
@@ -10,8 +10,8 @@ |
#import "ARDVideoCallViewController.h" |
-#import "RTCAVFoundationVideoSource.h" |
-#import "RTCLogging.h" |
+#import "webrtc/api/objc/RTCAVFoundationVideoSource.h" |
+#import "webrtc/base/objc/RTCLogging.h" |
#import "ARDAppClient.h" |
#import "ARDVideoCallView.h" |
@@ -47,7 +47,7 @@ |
_videoCallView = [[ARDVideoCallView alloc] initWithFrame:CGRectZero]; |
_videoCallView.delegate = self; |
_videoCallView.statusLabel.text = |
- [self statusTextForState:RTCICEConnectionNew]; |
+ [self statusTextForState:RTCIceConnectionStateNew]; |
self.view = _videoCallView; |
} |
@@ -70,7 +70,7 @@ |
} |
- (void)appClient:(ARDAppClient *)client |
- didChangeConnectionState:(RTCICEConnectionState)state { |
+ didChangeConnectionState:(RTCIceConnectionState)state { |
RTCLog(@"ICE state changed: %d", state); |
__weak ARDVideoCallViewController *weakSelf = self; |
dispatch_async(dispatch_get_main_queue(), ^{ |
@@ -169,17 +169,17 @@ |
} |
} |
-- (NSString *)statusTextForState:(RTCICEConnectionState)state { |
+- (NSString *)statusTextForState:(RTCIceConnectionState)state { |
switch (state) { |
- case RTCICEConnectionNew: |
- case RTCICEConnectionChecking: |
+ case RTCIceConnectionStateNew: |
+ case RTCIceConnectionStateChecking: |
return @"Connecting..."; |
- case RTCICEConnectionConnected: |
- case RTCICEConnectionCompleted: |
- case RTCICEConnectionFailed: |
- case RTCICEConnectionDisconnected: |
- case RTCICEConnectionClosed: |
- case RTCICEConnectionMax: |
+ case RTCIceConnectionStateConnected: |
+ case RTCIceConnectionStateCompleted: |
+ case RTCIceConnectionStateFailed: |
+ case RTCIceConnectionStateDisconnected: |
+ case RTCIceConnectionStateClosed: |
+ case RTCIceConnectionStateMax: |
tkchin_webrtc
2016/03/08 19:51:22
nit: any chance we can rename this to RTCIceConnec
hjon_webrtc
2016/03/10 03:32:43
Seems fine to me. Separate CL or as part of this o
|
return nil; |
} |
} |