mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-07 08:01:10 +00:00
Merge branch 'webrtc-compatibility'
This commit is contained in:
commit
e937ca52bf
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#import "Instance.h"
|
#import "Instance.h"
|
||||||
#import "InstanceImpl.h"
|
#import "InstanceImpl.h"
|
||||||
#import "reference/InstanceImplReference.h"
|
#import "v2/InstanceV2Impl.h"
|
||||||
#include "StaticThreads.h"
|
#include "StaticThreads.h"
|
||||||
|
|
||||||
#import "VideoCaptureInterface.h"
|
#import "VideoCaptureInterface.h"
|
||||||
@ -333,7 +333,7 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL;
|
|||||||
}
|
}
|
||||||
|
|
||||||
+ (NSArray<NSString *> * _Nonnull)versionsWithIncludeReference:(bool)__unused includeReference {
|
+ (NSArray<NSString *> * _Nonnull)versionsWithIncludeReference:(bool)__unused includeReference {
|
||||||
return @[@"2.7.7", @"3.0.0"];
|
return @[@"2.7.7", @"3.0.0", @"4.0.0"];
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (tgcalls::ProtocolVersion)protocolVersionFromLibraryVersion:(NSString *)version {
|
+ (tgcalls::ProtocolVersion)protocolVersionFromLibraryVersion:(NSString *)version {
|
||||||
@ -444,10 +444,9 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL;
|
|||||||
static dispatch_once_t onceToken;
|
static dispatch_once_t onceToken;
|
||||||
dispatch_once(&onceToken, ^{
|
dispatch_once(&onceToken, ^{
|
||||||
tgcalls::Register<tgcalls::InstanceImpl>();
|
tgcalls::Register<tgcalls::InstanceImpl>();
|
||||||
|
tgcalls::Register<tgcalls::InstanceV2Impl>();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
_tgVoip = tgcalls::Meta::Create([version UTF8String], (tgcalls::Descriptor){
|
_tgVoip = tgcalls::Meta::Create([version UTF8String], (tgcalls::Descriptor){
|
||||||
.config = config,
|
.config = config,
|
||||||
.persistentState = (tgcalls::PersistentState){ derivedStateValue },
|
.persistentState = (tgcalls::PersistentState){ derivedStateValue },
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 82d6e2d5a45135458610ce03dd700143b8e92ad6
|
Subproject commit 7eaea3e5286afc9d911e6b1fc6d41c6cc6c3be97
|
Loading…
x
Reference in New Issue
Block a user