ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 21:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5011f833d478fd29888c030fcbb037933409350a'

Browse Source
This commit is contained in:
Ali 2021-01-27 18:00:49 +05:00
commit 19ed9642cf
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/MediaPlayer/Sources/MediaPlayer.swift
View File

@ -479,7 +479,7 @@ private final class MediaPlayerContext {
self.state = .seeking(frameSource: frameSource, timestamp: timestamp, seekState: seekState, disposable: disposable, action: .play, enableSound: enableSound)
self.lastStatusUpdateTimestamp = nil
case let .paused(loadedState):
if faded {
if faded && false {
self.fadeTimer?.invalidate()
var volume: Double = 0.0
@ -674,7 +674,7 @@ private final class MediaPlayerContext {
self.state = .paused(loadedState)
self.lastStatusUpdateTimestamp = nil
if faded {
if faded && false {
self.fadeTimer?.invalidate()
var volume: Double = 1.0

2
submodules/MediaPlayer/Sources/MediaPlayerAudioRenderer.swift
View File

@ -317,7 +317,7 @@ private final class AudioPlayerRendererContext {
fileprivate func setVolume(_ volume: Double) {
if let mixerAudioUnit = self.mixerAudioUnit {
AudioUnitSetParameter(mixerAudioUnit,kMultiChannelMixerParam_Volume, kAudioUnitScope_Input, 0, Float32(volume), 0)
AudioUnitSetParameter(mixerAudioUnit, kMultiChannelMixerParam_Volume, kAudioUnitScope_Input, 0, Float32(volume), 0)
}
}

10
submodules/TelegramBaseController/Sources/TelegramBaseController.swift
View File

@ -321,12 +321,20 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
availableGroupCall = .single(nil)
}
let previousCurrentGroupCall = Atomic<PresentationGroupCall?>(value: nil)
self.currentGroupCallDisposable = combineLatest(queue: .mainQueue(), availableGroupCall, currentGroupCall).start(next: { [weak self] availableState, currentGroupCall in
guard let strongSelf = self else {
return
}
let panelData = currentGroupCall != nil || availableState?.participantCount == 0 ? nil : availableState
let previousCurrentGroupCall = previousCurrentGroupCall.swap(currentGroupCall)
let panelData: GroupCallPanelData?
if previousCurrentGroupCall != nil && currentGroupCall == nil && availableState?.participantCount == 1 {
panelData = nil
} else {
panelData = currentGroupCall != nil || availableState?.participantCount == 0 ? nil : availableState
}
let wasEmpty = strongSelf.groupCallPanelData == nil
strongSelf.groupCallPanelData = panelData

4
submodules/TelegramCallsUI/Sources/VoiceChatVolumeContextItem.swift
View File

@ -138,8 +138,8 @@ private final class VoiceChatVolumeContextItemNode: ASDisplayNode, ContextMenuCu
let iconSize = CGSize(width: 36.0, height: 36.0)
let iconFrame = CGRect(origin: CGPoint(x: size.width - iconSize.width - 10.0, y: floor((size.height - iconSize.height) / 2.0)), size: iconSize)
transition.updateFrameAdditive(node: self.backgroundIconNode, frame: iconFrame)
transition.updateFrameAdditive(node: self.foregroundIconNode, frame: iconFrame)
self.backgroundIconNode.frame = iconFrame
self.foregroundIconNode.frame = iconFrame
self.updateValue(transition: transition)
})

2
submodules/TelegramUI/Sources/ChatEmptyNode.swift
View File

@ -838,7 +838,7 @@ final class ChatEmptyNode: ASDisplayNode {
} else if let _ = interfaceState.peerNearbyData {
contentType = .peerNearby
} else if let _ = peer as? TelegramUser {
if case .joined = emptyType {
if case .joined = emptyType, !peer.isDeleted {
contentType = .greeting
} else {
contentType = .regular