ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp'

Browse Source 
# Conflicts:
#	submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h
#	submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
[skip ci]
This commit is contained in:
overtake 2020-07-15 17:19:22 +03:00
commit 2f3d2ea58a
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h
View File

@ -2,7 +2,15 @@
#define OngoingCallContext_h
#import <Foundation/Foundation.h>
#ifndef WEBRTC_IOS
#import <AppKit/AppKit.h>
#else
#import <UIKit/UIKit.h>
#endif
#ifndef WEBRTC_IOS
#define UIView NSView
#endif
@interface OngoingCallConnectionDescriptionWebrtc : NSObject

11
submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
View File

@ -1,11 +1,22 @@
#ifndef WEBRTC_IOS
#import "OngoingCallThreadLocalContext.h"
#else
#import <TgVoip/OngoingCallThreadLocalContext.h>
#endif
#import "Instance.h"
#import "InstanceImpl.h"
#import "VideoCaptureInterface.h"
#ifndef WEBRTC_IOS
#import "platform/darwin/VideoMetalViewMac.h"
#define GLVideoView VideoMetalView
#define UIViewContentModeScaleAspectFill kCAGravityResizeAspectFill
#else
#import "platform/darwin/VideoMetalView.h"
#import "platform/darwin/GLVideoView.h"
#endif
@implementation OngoingCallConnectionDescriptionWebrtc