OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #import "ARDAppClient.h" | 11 #import "ARDAppClient.h" |
12 | 12 |
13 #import "ARDRoomServerClient.h" | 13 #import "ARDRoomServerClient.h" |
14 #import "ARDSignalingChannel.h" | 14 #import "ARDSignalingChannel.h" |
15 #import "ARDTURNClient.h" | 15 #import "ARDTURNClient.h" |
16 #import "RTCPeerConnection.h" | 16 #import "webrtc/api/objc/RTCPeerConnection.h" |
tkchin_webrtc
2016/03/08 19:51:21
move webrtc imports into their own section above
hjon_webrtc
2016/03/10 03:32:42
Done.
| |
17 #import "RTCPeerConnectionDelegate.h" | 17 #import "webrtc/api/objc/RTCPeerConnectionFactory.h" |
18 #import "RTCPeerConnectionFactory.h" | |
19 #import "RTCSessionDescriptionDelegate.h" | |
20 #import "RTCStatsDelegate.h" | |
21 | 18 |
22 @interface ARDAppClient () <ARDSignalingChannelDelegate, | 19 @interface ARDAppClient () <ARDSignalingChannelDelegate, |
23 RTCPeerConnectionDelegate, RTCSessionDescriptionDelegate, RTCStatsDelegate> | 20 RTCPeerConnectionDelegate> |
24 | 21 |
25 // All properties should only be mutated from the main queue. | 22 // All properties should only be mutated from the main queue. |
26 @property(nonatomic, strong) id<ARDRoomServerClient> roomServerClient; | 23 @property(nonatomic, strong) id<ARDRoomServerClient> roomServerClient; |
27 @property(nonatomic, strong) id<ARDSignalingChannel> channel; | 24 @property(nonatomic, strong) id<ARDSignalingChannel> channel; |
28 @property(nonatomic, strong) id<ARDSignalingChannel> loopbackChannel; | 25 @property(nonatomic, strong) id<ARDSignalingChannel> loopbackChannel; |
29 @property(nonatomic, strong) id<ARDTURNClient> turnClient; | 26 @property(nonatomic, strong) id<ARDTURNClient> turnClient; |
30 | 27 |
31 @property(nonatomic, strong) RTCPeerConnection *peerConnection; | 28 @property(nonatomic, strong) RTCPeerConnection *peerConnection; |
32 @property(nonatomic, strong) RTCPeerConnectionFactory *factory; | 29 @property(nonatomic, strong) RTCPeerConnectionFactory *factory; |
33 @property(nonatomic, strong) NSMutableArray *messageQueue; | 30 @property(nonatomic, strong) NSMutableArray *messageQueue; |
(...skipping 13 matching lines...) Expand all Loading... | |
47 | 44 |
48 @property(nonatomic, strong) | 45 @property(nonatomic, strong) |
49 RTCMediaConstraints *defaultPeerConnectionConstraints; | 46 RTCMediaConstraints *defaultPeerConnectionConstraints; |
50 | 47 |
51 - (instancetype)initWithRoomServerClient:(id<ARDRoomServerClient>)rsClient | 48 - (instancetype)initWithRoomServerClient:(id<ARDRoomServerClient>)rsClient |
52 signalingChannel:(id<ARDSignalingChannel>)channel | 49 signalingChannel:(id<ARDSignalingChannel>)channel |
53 turnClient:(id<ARDTURNClient>)turnClient | 50 turnClient:(id<ARDTURNClient>)turnClient |
54 delegate:(id<ARDAppClientDelegate>)delegate; | 51 delegate:(id<ARDAppClientDelegate>)delegate; |
55 | 52 |
56 @end | 53 @end |
OLD | NEW |