| 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 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 [_logView setEditable:NO]; | 207 [_logView setEditable:NO]; |
| 208 | 208 |
| 209 [self setupActionItemsView]; | 209 [self setupActionItemsView]; |
| 210 | 210 |
| 211 _scrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect]; | 211 _scrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect]; |
| 212 [_scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; | 212 [_scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; |
| 213 [_scrollView setHasVerticalScroller:YES]; | 213 [_scrollView setHasVerticalScroller:YES]; |
| 214 [_scrollView setDocumentView:_logView]; | 214 [_scrollView setDocumentView:_logView]; |
| 215 [self addSubview:_scrollView]; | 215 [self addSubview:_scrollView]; |
| 216 | 216 |
| 217 | |
| 218 // NOTE (daniela): Ignoring Clang diagonstic here. | 217 // NOTE (daniela): Ignoring Clang diagonstic here. |
| 219 // We're performing run time check to make sure class is available on runtime. | 218 // We're performing run time check to make sure class is available on runtime. |
| 220 // If not we're providing sensible default. | 219 // If not we're providing sensible default. |
| 221 #pragma clang diagnostic push | 220 #pragma clang diagnostic push |
| 222 #pragma clang diagnostic ignored "-Wpartial-availability" | 221 #pragma clang diagnostic ignored "-Wpartial-availability" |
| 223 if ([RTCMTLNSVideoView class]) { | 222 if ([RTCMTLNSVideoView class]) { |
| 224 _remoteVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; | 223 _remoteVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; |
| 225 _localVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; | 224 _localVideoView = [[RTCMTLNSVideoView alloc] initWithFrame:NSZeroRect]; |
| 226 } else { | 225 } else { |
| 227 NSOpenGLPixelFormatAttribute attributes[] = { | 226 NSOpenGLPixelFormatAttribute attributes[] = { |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 [self.mainView.remoteVideoView renderFrame:nil]; | 415 [self.mainView.remoteVideoView renderFrame:nil]; |
| 417 [self.mainView.localVideoView renderFrame:nil]; | 416 [self.mainView.localVideoView renderFrame:nil]; |
| 418 } | 417 } |
| 419 | 418 |
| 420 - (void)disconnect { | 419 - (void)disconnect { |
| 421 [self resetUI]; | 420 [self resetUI]; |
| 422 [_client disconnect]; | 421 [_client disconnect]; |
| 423 } | 422 } |
| 424 | 423 |
| 425 @end | 424 @end |
| OLD | NEW |