webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m - Issue 1690313002: Update iOS AppRTCDemo to use the updated Objective-C API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m

Issue 1690313002: Update iOS AppRTCDemo to use the updated Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Update Mac demo and other changes after updating against master Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m ('K') | « webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m ('k') | webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm » ('j') | webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m

diff --git a/webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m b/webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m

index 80b0691247cb5aee3e6b3f89e830e8c5b2cc5025..c28e83a2921a1aa8210cef3f330d3543435c7177 100644

--- a/webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m

+++ b/webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m

@@ -12,8 +12,8 @@

#import <AVFoundation/AVFoundation.h>

#import "ARDAppClient.h"

-#import "RTCNSGLVideoView.h"

-#import "RTCVideoTrack.h"

+#import "webrtc/api/objc/RTCNSGLVideoView.h"

tkchin_webrtc 2016/03/08 19:51:22 ditto move import

hjon_webrtc 2016/03/10 03:32:43 Done.

+#import "webrtc/api/objc/RTCVideoTrack.h"

static NSUInteger const kContentWidth = 1280;

static NSUInteger const kContentHeight = 720;

@@ -250,7 +250,7 @@ static NSUInteger const kLogViewHeight = 280;

}

- (void)appClient:(ARDAppClient *)client

- didChangeConnectionState:(RTCICEConnectionState)state {

+ didChangeConnectionState:(RTCIceConnectionState)state {

}

- (void)appClient:(ARDAppClient *)client