Fix typo by renaming RTCSessionDescriptonDelegate -> RTCSessionsDescriptionDelegate

R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12059004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5946 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tkchin@webrtc.org 2014-04-21 18:47:24 +00:00
parent 229e16e254
commit ec3d8ecdcc
8 changed files with 30 additions and 29 deletions

View File

@ -37,7 +37,7 @@
#import "RTCMediaConstraints+Internal.h" #import "RTCMediaConstraints+Internal.h"
#import "RTCMediaStream+Internal.h" #import "RTCMediaStream+Internal.h"
#import "RTCSessionDescription+Internal.h" #import "RTCSessionDescription+Internal.h"
#import "RTCSessionDescriptonDelegate.h" #import "RTCSessionDescriptionDelegate.h"
#import "RTCSessionDescription.h" #import "RTCSessionDescription.h"
#include "talk/app/webrtc/jsep.h" #include "talk/app/webrtc/jsep.h"
@ -50,8 +50,9 @@ namespace webrtc {
class RTCCreateSessionDescriptionObserver class RTCCreateSessionDescriptionObserver
: public CreateSessionDescriptionObserver { : public CreateSessionDescriptionObserver {
public: public:
RTCCreateSessionDescriptionObserver(id<RTCSessionDescriptonDelegate> delegate, RTCCreateSessionDescriptionObserver(
RTCPeerConnection* peerConnection) { id<RTCSessionDescriptionDelegate> delegate,
RTCPeerConnection* peerConnection) {
_delegate = delegate; _delegate = delegate;
_peerConnection = peerConnection; _peerConnection = peerConnection;
} }
@ -76,13 +77,13 @@ class RTCCreateSessionDescriptionObserver
} }
private: private:
id<RTCSessionDescriptonDelegate> _delegate; id<RTCSessionDescriptionDelegate> _delegate;
RTCPeerConnection* _peerConnection; RTCPeerConnection* _peerConnection;
}; };
class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver { class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
public: public:
RTCSetSessionDescriptionObserver(id<RTCSessionDescriptonDelegate> delegate, RTCSetSessionDescriptionObserver(id<RTCSessionDescriptionDelegate> delegate,
RTCPeerConnection* peerConnection) { RTCPeerConnection* peerConnection) {
_delegate = delegate; _delegate = delegate;
_peerConnection = peerConnection; _peerConnection = peerConnection;
@ -104,7 +105,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
} }
private: private:
id<RTCSessionDescriptonDelegate> _delegate; id<RTCSessionDescriptionDelegate> _delegate;
RTCPeerConnection* _peerConnection; RTCPeerConnection* _peerConnection;
}; };
} }
@ -132,7 +133,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
return YES; return YES;
} }
- (void)createAnswerWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate - (void)createAnswerWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints*)constraints { constraints:(RTCMediaConstraints*)constraints {
talk_base::scoped_refptr<webrtc::RTCCreateSessionDescriptionObserver> talk_base::scoped_refptr<webrtc::RTCCreateSessionDescriptionObserver>
observer(new talk_base::RefCountedObject< observer(new talk_base::RefCountedObject<
@ -140,7 +141,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
self.peerConnection->CreateAnswer(observer, constraints.constraints); self.peerConnection->CreateAnswer(observer, constraints.constraints);
} }
- (void)createOfferWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate - (void)createOfferWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints*)constraints { constraints:(RTCMediaConstraints*)constraints {
talk_base::scoped_refptr<webrtc::RTCCreateSessionDescriptionObserver> talk_base::scoped_refptr<webrtc::RTCCreateSessionDescriptionObserver>
observer(new talk_base::RefCountedObject< observer(new talk_base::RefCountedObject<
@ -154,7 +155,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
} }
- (void)setLocalDescriptionWithDelegate: - (void)setLocalDescriptionWithDelegate:
(id<RTCSessionDescriptonDelegate>)delegate (id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription*)sdp { sessionDescription:(RTCSessionDescription*)sdp {
talk_base::scoped_refptr<webrtc::RTCSetSessionDescriptionObserver> observer( talk_base::scoped_refptr<webrtc::RTCSetSessionDescriptionObserver> observer(
new talk_base::RefCountedObject<webrtc::RTCSetSessionDescriptionObserver>( new talk_base::RefCountedObject<webrtc::RTCSetSessionDescriptionObserver>(
@ -163,7 +164,7 @@ class RTCSetSessionDescriptionObserver : public SetSessionDescriptionObserver {
} }
- (void)setRemoteDescriptionWithDelegate: - (void)setRemoteDescriptionWithDelegate:
(id<RTCSessionDescriptonDelegate>)delegate (id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription*)sdp { sessionDescription:(RTCSessionDescription*)sdp {
talk_base::scoped_refptr<webrtc::RTCSetSessionDescriptionObserver> observer( talk_base::scoped_refptr<webrtc::RTCSetSessionDescriptionObserver> observer(
new talk_base::RefCountedObject<webrtc::RTCSetSessionDescriptionObserver>( new talk_base::RefCountedObject<webrtc::RTCSetSessionDescriptionObserver>(

View File

@ -32,7 +32,7 @@
@class RTCMediaConstraints; @class RTCMediaConstraints;
@class RTCMediaStream; @class RTCMediaStream;
@class RTCSessionDescription; @class RTCSessionDescription;
@protocol RTCSessionDescriptonDelegate; @protocol RTCSessionDescriptionDelegate;
// RTCPeerConnection is an ObjectiveC friendly wrapper around a PeerConnection // RTCPeerConnection is an ObjectiveC friendly wrapper around a PeerConnection
// object. See the documentation in talk/app/webrtc/peerconnectioninterface.h. // object. See the documentation in talk/app/webrtc/peerconnectioninterface.h.
@ -67,25 +67,25 @@
- (void)removeStream:(RTCMediaStream *)stream; - (void)removeStream:(RTCMediaStream *)stream;
// Create a new offer. // Create a new offer.
// Success or failure will be reported via RTCSessionDescriptonDelegate. // Success or failure will be reported via RTCSessionDescriptionDelegate.
- (void)createOfferWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate - (void)createOfferWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints *)constraints; constraints:(RTCMediaConstraints *)constraints;
// Create an answer to an offer. // Create an answer to an offer.
// Success or failure will be reported via RTCSessionDescriptonDelegate. // Success or failure will be reported via RTCSessionDescriptionDelegate.
- (void)createAnswerWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate - (void)createAnswerWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
constraints:(RTCMediaConstraints *)constraints; constraints:(RTCMediaConstraints *)constraints;
// Sets the local session description. // Sets the local session description.
// Success or failure will be reported via RTCSessionDescriptonDelegate. // Success or failure will be reported via RTCSessionDescriptionDelegate.
- (void) - (void)
setLocalDescriptionWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate setLocalDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription *)sdp; sessionDescription:(RTCSessionDescription *)sdp;
// Sets the remote session description. // Sets the remote session description.
// Success or failure will be reported via RTCSessionDescriptonDelegate. // Success or failure will be reported via RTCSessionDescriptionDelegate.
- (void) - (void)
setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptonDelegate>)delegate setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
sessionDescription:(RTCSessionDescription *)sdp; sessionDescription:(RTCSessionDescription *)sdp;
// Restarts or updates the ICE Agent process of gathering local candidates // Restarts or updates the ICE Agent process of gathering local candidates

View File

@ -33,9 +33,9 @@
extern NSString* const kRTCSessionDescriptionDelegateErrorDomain; extern NSString* const kRTCSessionDescriptionDelegateErrorDomain;
extern int const kRTCSessionDescriptionDelegateErrorCode; extern int const kRTCSessionDescriptionDelegateErrorCode;
// RTCSessionDescriptonDelegate is a protocol for listening to callback messages // RTCSessionDescriptionDelegate is a protocol for listening to callback
// when RTCSessionDescriptions are created or set. // messages when RTCSessionDescriptions are created or set.
@protocol RTCSessionDescriptonDelegate<NSObject> @protocol RTCSessionDescriptionDelegate<NSObject>
// Called when creating a session. // Called when creating a session.
- (void)peerConnection:(RTCPeerConnection *)peerConnection - (void)peerConnection:(RTCPeerConnection *)peerConnection

View File

@ -27,14 +27,14 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "RTCSessionDescriptonDelegate.h" #import "RTCSessionDescriptionDelegate.h"
@class RTCSessionDescription; @class RTCSessionDescription;
// Observer of SDP-related events, used by RTCPeerConnectionTest to check // Observer of SDP-related events, used by RTCPeerConnectionTest to check
// expectations. // expectations.
@interface RTCSessionDescriptionSyncObserver : NSObject< @interface RTCSessionDescriptionSyncObserver : NSObject<
RTCSessionDescriptonDelegate> RTCSessionDescriptionDelegate>
// Error string. May be nil. // Error string. May be nil.
@property(atomic, copy) NSString *error; @property(atomic, copy) NSString *error;

View File

@ -71,7 +71,7 @@
[self.condition unlock]; [self.condition unlock];
} }
#pragma mark - RTCSessionDescriptonDelegate methods #pragma mark - RTCSessionDescriptionDelegate methods
- (void)peerConnection:(RTCPeerConnection*)peerConnection - (void)peerConnection:(RTCPeerConnection*)peerConnection
didCreateSessionDescription:(RTCSessionDescription*)sdp didCreateSessionDescription:(RTCSessionDescription*)sdp
error:(NSError*)error { error:(NSError*)error {

View File

@ -29,7 +29,7 @@
#import "GAEChannelClient.h" #import "GAEChannelClient.h"
#import "APPRTCAppClient.h" #import "APPRTCAppClient.h"
#import "RTCSessionDescriptonDelegate.h" #import "RTCSessionDescriptionDelegate.h"
#import "RTCVideoSource.h" #import "RTCVideoSource.h"
// Used to send a message to an apprtc.appspot.com "room". // Used to send a message to an apprtc.appspot.com "room".
@protocol APPRTCSendMessage<NSObject> @protocol APPRTCSendMessage<NSObject>
@ -48,7 +48,7 @@
@interface APPRTCAppDelegate : UIResponder<ICEServerDelegate, @interface APPRTCAppDelegate : UIResponder<ICEServerDelegate,
GAEMessageHandler, GAEMessageHandler,
APPRTCSendMessage, APPRTCSendMessage,
RTCSessionDescriptonDelegate, RTCSessionDescriptionDelegate,
UIApplicationDelegate> UIApplicationDelegate>
@property(strong, nonatomic) UIWindow* window; @property(strong, nonatomic) UIWindow* window;

View File

@ -357,7 +357,7 @@
[self closeVideoUI]; [self closeVideoUI];
} }
#pragma mark - RTCSessionDescriptonDelegate methods #pragma mark - RTCSessionDescriptionDelegate methods
// Match |pattern| to |string| and return the first group of the first // Match |pattern| to |string| and return the first group of the first
// match, or nil if no match was found. // match, or nil if no match was found.

View File

@ -215,7 +215,7 @@
'app/webrtc/objc/public/RTCPeerConnectionDelegate.h', 'app/webrtc/objc/public/RTCPeerConnectionDelegate.h',
'app/webrtc/objc/public/RTCPeerConnectionFactory.h', 'app/webrtc/objc/public/RTCPeerConnectionFactory.h',
'app/webrtc/objc/public/RTCSessionDescription.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/RTCTypes.h',
'app/webrtc/objc/public/RTCVideoCapturer.h', 'app/webrtc/objc/public/RTCVideoCapturer.h',
'app/webrtc/objc/public/RTCVideoRenderer.h', 'app/webrtc/objc/public/RTCVideoRenderer.h',