| Index: talk/app/webrtc/objc/RTCMediaSource.mm
|
| diff --git a/talk/app/webrtc/objc/RTCMediaSource.mm b/talk/app/webrtc/objc/RTCMediaSource.mm
|
| deleted file mode 100644
|
| index 8d2bb1f4176d67543ddacf7d75781a6a9ee076c2..0000000000000000000000000000000000000000
|
| --- a/talk/app/webrtc/objc/RTCMediaSource.mm
|
| +++ /dev/null
|
| @@ -1,65 +0,0 @@
|
| -/*
|
| - * libjingle
|
| - * Copyright 2013 Google Inc.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are met:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright notice,
|
| - * this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright notice,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| -#error "This file requires ARC support."
|
| -#endif
|
| -
|
| -#import "RTCMediaSource+Internal.h"
|
| -
|
| -#import "RTCEnumConverter.h"
|
| -
|
| -@implementation RTCMediaSource {
|
| - rtc::scoped_refptr<webrtc::MediaSourceInterface> _mediaSource;
|
| -}
|
| -
|
| -- (RTCSourceState)state {
|
| - return [RTCEnumConverter convertSourceStateToObjC:self.mediaSource->state()];
|
| -}
|
| -
|
| -@end
|
| -
|
| -@implementation RTCMediaSource (Internal)
|
| -
|
| -- (id)initWithMediaSource:
|
| - (rtc::scoped_refptr<webrtc::MediaSourceInterface>)mediaSource {
|
| - if (!mediaSource) {
|
| - NSAssert(NO, @"nil arguments not allowed");
|
| - self = nil;
|
| - return nil;
|
| - }
|
| - if ((self = [super init])) {
|
| - _mediaSource = mediaSource;
|
| - }
|
| - return self;
|
| -}
|
| -
|
| -- (rtc::scoped_refptr<webrtc::MediaSourceInterface>)mediaSource {
|
| - return _mediaSource;
|
| -}
|
| -
|
| -@end
|
|
|