ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-25 20:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'experiments/group-calls'

Browse Source
This commit is contained in:
Ali 2020-11-02 22:52:15 +04:00
commit a93646ea84
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/SettingsUI/Sources/DebugController.swift
View File

@ -738,12 +738,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
}) })
case .voiceConference: case .voiceConference:
return ItemListDisclosureItem(presentationData: presentationData, title: "Voice Conference (Test)", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Voice Conference (Test)", label: "", sectionId: self.section, style: .blocks, action: {
/*guard let context = arguments.context else { guard let context = arguments.context else {
return return
} }
let controller = GroupCallController(context: context) let controller = GroupCallController(context: context)
controller.navigationPresentation = .modal controller.navigationPresentation = .modal
arguments.pushController(controller)*/ arguments.pushController(controller)
}) })
case let .preferredVideoCodec(_, title, value, isSelected): case let .preferredVideoCodec(_, title, value, isSelected):
return ItemListCheckboxItem(presentationData: presentationData, title: title, style: .right, checked: isSelected, zeroSeparatorInsets: false, sectionId: self.section, action: { return ItemListCheckboxItem(presentationData: presentationData, title: title, style: .right, checked: isSelected, zeroSeparatorInsets: false, sectionId: self.section, action: {
@ -824,7 +824,7 @@ private func debugControllerEntries(presentationData: PresentationData, loggingS
entries.append(.playerEmbedding(experimentalSettings.playerEmbedding)) entries.append(.playerEmbedding(experimentalSettings.playerEmbedding))
entries.append(.playlistPlayback(experimentalSettings.playlistPlayback)) entries.append(.playlistPlayback(experimentalSettings.playlistPlayback))
//entries.append(.voiceConference) entries.append(.voiceConference)
let codecs: [(String, String?)] = [ let codecs: [(String, String?)] = [
("No Preference", nil), ("No Preference", nil),

5
submodules/TelegramCallsUI/Sources/GroupCallController.swift
View File

@ -10,8 +10,7 @@ import TelegramAudio
import AccountContext import AccountContext
public final class GroupCallController: ViewController { public final class GroupCallController: ViewController {
} private final class Node: ViewControllerTracingNode {
/* private final class Node: ViewControllerTracingNode {
private let context: AccountContext private let context: AccountContext
private let presentationData: PresentationData private let presentationData: PresentationData
@ -146,4 +145,4 @@ public final class GroupCallController: ViewController {
self.controllerNode.containerLayoutUpdated(layout, transition: transition) self.controllerNode.containerLayoutUpdated(layout, transition: transition)
} }
} }
*/

4
submodules/TelegramVoip/Sources/GroupCallContext.swift
View File

@ -2,7 +2,7 @@ import Foundation
import SwiftSignalKit import SwiftSignalKit
import TgVoipWebrtc import TgVoipWebrtc
/*private final class ContextQueueImpl: NSObject, OngoingCallThreadLocalContextQueueWebrtc { private final class ContextQueueImpl: NSObject, OngoingCallThreadLocalContextQueueWebrtc {
private let queue: Queue private let queue: Queue
init(queue: Queue) { init(queue: Queue) {
@ -1467,4 +1467,4 @@ public final class GroupCallContext {
} }
} }
} }
*/

4
submodules/TgVoipWebrtc/Sources/GroupCallThreadLocalContext.mm
View File

@ -1,7 +1,7 @@
#import <TgVoipWebrtc/GroupCallThreadLocalContext.h> #import <TgVoipWebrtc/GroupCallThreadLocalContext.h>
/*#import "group/GroupInstanceImpl.h" #import "group/GroupInstanceImpl.h"
@interface GroupCallThreadLocalContext () { @interface GroupCallThreadLocalContext () {
id<OngoingCallThreadLocalContextQueueWebrtc> _queue; id<OngoingCallThreadLocalContextQueueWebrtc> _queue;
@ -55,4 +55,4 @@
} }
@end @end
*/

2
submodules/TgVoipWebrtc/tgcalls

@ -1 +1 @@
Subproject commit 64f96a1b4fcfb8afdb0fb7749082cb42cdad7901 Subproject commit 4f7501d281b851e6302b2a2d7298c733eee82414