diff --git a/talk/app/webrtc/objc/RTCPeerConnection.mm b/talk/app/webrtc/objc/RTCPeerConnection.mm index a7e31a1d77..9188653e8f 100644 --- a/talk/app/webrtc/objc/RTCPeerConnection.mm +++ b/talk/app/webrtc/objc/RTCPeerConnection.mm @@ -37,7 +37,7 @@ #import "RTCMediaConstraints+Internal.h" #import "RTCMediaStream+Internal.h" #import "RTCSessionDescription+Internal.h" -#import "RTCSessionDescriptonDelegate.h" +#import "RTCSessionDescriptionDelegate.h" #import "RTCSessionDescription.h" #include "talk/app/webrtc/jsep.h" @@ -50,8 +50,9 @@ namespace webrtc { class RTCCreateSessionDescriptionObserver : public CreateSessionDescriptionObserver { public: - RTCCreateSessionDescriptionObserver(id delegate, - RTCPeerConnection* peerConnection) { + RTCCreateSessionDescriptionObserver( + id delegate, + RTCPeerConnection* peerConnection) { _delegate = delegate; _peerConnection = peerConnection; } @@ -76,13 +77,13 @@ class RTCCreateSessionDescriptionObserver } private: - id _delegate; + id _delegate; RTCPeerConnection* _peerConnection; }; class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { public: - RTCSetSessionDescriptionObserver(id delegate, + RTCSetSessionDescriptionObserver(id delegate, RTCPeerConnection* peerConnection) { _delegate = delegate; _peerConnection = peerConnection; @@ -104,7 +105,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { } private: - id _delegate; + id _delegate; RTCPeerConnection* _peerConnection; }; } @@ -132,7 +133,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { return YES; } -- (void)createAnswerWithDelegate:(id)delegate +- (void)createAnswerWithDelegate:(id)delegate constraints:(RTCMediaConstraints*)constraints { talk_base::scoped_refptr observer(new talk_base::RefCountedObject< @@ -140,7 +141,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { self.peerConnection->CreateAnswer(observer, constraints.constraints); } -- (void)createOfferWithDelegate:(id)delegate +- (void)createOfferWithDelegate:(id)delegate constraints:(RTCMediaConstraints*)constraints { talk_base::scoped_refptr observer(new talk_base::RefCountedObject< @@ -154,7 +155,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { } - (void)setLocalDescriptionWithDelegate: - (id)delegate + (id)delegate sessionDescription:(RTCSessionDescription*)sdp { talk_base::scoped_refptr observer( new talk_base::RefCountedObject( @@ -163,7 +164,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { } - (void)setRemoteDescriptionWithDelegate: - (id)delegate + (id)delegate sessionDescription:(RTCSessionDescription*)sdp { talk_base::scoped_refptr observer( new talk_base::RefCountedObject( diff --git a/talk/app/webrtc/objc/public/RTCPeerConnection.h b/talk/app/webrtc/objc/public/RTCPeerConnection.h index c66bac8b4c..45e0a932c3 100644 --- a/talk/app/webrtc/objc/public/RTCPeerConnection.h +++ b/talk/app/webrtc/objc/public/RTCPeerConnection.h @@ -32,7 +32,7 @@ @class RTCMediaConstraints; @class RTCMediaStream; @class RTCSessionDescription; -@protocol RTCSessionDescriptonDelegate; +@protocol RTCSessionDescriptionDelegate; // RTCPeerConnection is an ObjectiveC friendly wrapper around a PeerConnection // object. See the documentation in talk/app/webrtc/peerconnectioninterface.h. @@ -67,25 +67,25 @@ - (void)removeStream:(RTCMediaStream *)stream; // Create a new offer. -// Success or failure will be reported via RTCSessionDescriptonDelegate. -- (void)createOfferWithDelegate:(id)delegate +// Success or failure will be reported via RTCSessionDescriptionDelegate. +- (void)createOfferWithDelegate:(id)delegate constraints:(RTCMediaConstraints *)constraints; // Create an answer to an offer. -// Success or failure will be reported via RTCSessionDescriptonDelegate. -- (void)createAnswerWithDelegate:(id)delegate +// Success or failure will be reported via RTCSessionDescriptionDelegate. +- (void)createAnswerWithDelegate:(id)delegate constraints:(RTCMediaConstraints *)constraints; // Sets the local session description. -// Success or failure will be reported via RTCSessionDescriptonDelegate. +// Success or failure will be reported via RTCSessionDescriptionDelegate. - (void) - setLocalDescriptionWithDelegate:(id)delegate + setLocalDescriptionWithDelegate:(id)delegate sessionDescription:(RTCSessionDescription *)sdp; // Sets the remote session description. -// Success or failure will be reported via RTCSessionDescriptonDelegate. +// Success or failure will be reported via RTCSessionDescriptionDelegate. - (void) - setRemoteDescriptionWithDelegate:(id)delegate + setRemoteDescriptionWithDelegate:(id)delegate sessionDescription:(RTCSessionDescription *)sdp; // Restarts or updates the ICE Agent process of gathering local candidates diff --git a/talk/app/webrtc/objc/public/RTCSessionDescriptonDelegate.h b/talk/app/webrtc/objc/public/RTCSessionDescriptionDelegate.h similarity index 91% rename from talk/app/webrtc/objc/public/RTCSessionDescriptonDelegate.h rename to talk/app/webrtc/objc/public/RTCSessionDescriptionDelegate.h index 409aaee5d6..ecdc581f5e 100644 --- a/talk/app/webrtc/objc/public/RTCSessionDescriptonDelegate.h +++ b/talk/app/webrtc/objc/public/RTCSessionDescriptionDelegate.h @@ -33,9 +33,9 @@ extern NSString* const kRTCSessionDescriptionDelegateErrorDomain; extern int const kRTCSessionDescriptionDelegateErrorCode; -// RTCSessionDescriptonDelegate is a protocol for listening to callback messages -// when RTCSessionDescriptions are created or set. -@protocol RTCSessionDescriptonDelegate +// RTCSessionDescriptionDelegate is a protocol for listening to callback +// messages when RTCSessionDescriptions are created or set. +@protocol RTCSessionDescriptionDelegate // Called when creating a session. - (void)peerConnection:(RTCPeerConnection *)peerConnection diff --git a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h index 18d7902886..8631f01704 100644 --- a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h +++ b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h @@ -27,14 +27,14 @@ #import -#import "RTCSessionDescriptonDelegate.h" +#import "RTCSessionDescriptionDelegate.h" @class RTCSessionDescription; // Observer of SDP-related events, used by RTCPeerConnectionTest to check // expectations. @interface RTCSessionDescriptionSyncObserver : NSObject< - RTCSessionDescriptonDelegate> + RTCSessionDescriptionDelegate> // Error string. May be nil. @property(atomic, copy) NSString *error; diff --git a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m index 75a4671b13..6d782536c6 100644 --- a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m +++ b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m @@ -71,7 +71,7 @@ [self.condition unlock]; } -#pragma mark - RTCSessionDescriptonDelegate methods +#pragma mark - RTCSessionDescriptionDelegate methods - (void)peerConnection:(RTCPeerConnection*)peerConnection didCreateSessionDescription:(RTCSessionDescription*)sdp error:(NSError*)error { diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h index 3e6d600bb4..dd810f74c0 100644 --- a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h +++ b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.h @@ -29,7 +29,7 @@ #import "GAEChannelClient.h" #import "APPRTCAppClient.h" -#import "RTCSessionDescriptonDelegate.h" +#import "RTCSessionDescriptionDelegate.h" #import "RTCVideoSource.h" // Used to send a message to an apprtc.appspot.com "room". @protocol APPRTCSendMessage @@ -48,7 +48,7 @@ @interface APPRTCAppDelegate : UIResponder @property(strong, nonatomic) UIWindow* window; diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m index e251816728..e6add76de1 100644 --- a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m +++ b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m @@ -357,7 +357,7 @@ [self closeVideoUI]; } -#pragma mark - RTCSessionDescriptonDelegate methods +#pragma mark - RTCSessionDescriptionDelegate methods // Match |pattern| to |string| and return the first group of the first // match, or nil if no match was found. diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index d61ac15205..3c64ded9c6 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -215,7 +215,7 @@ 'app/webrtc/objc/public/RTCPeerConnectionDelegate.h', 'app/webrtc/objc/public/RTCPeerConnectionFactory.h', 'app/webrtc/objc/public/RTCSessionDescription.h', - 'app/webrtc/objc/public/RTCSessionDescriptonDelegate.h', + 'app/webrtc/objc/public/RTCSessionDescriptionDelegate.h', 'app/webrtc/objc/public/RTCTypes.h', 'app/webrtc/objc/public/RTCVideoCapturer.h', 'app/webrtc/objc/public/RTCVideoRenderer.h',