felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 00:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

#4545 - Switch back to using multiple audio player instances, allow pausing when starting a new player.

Browse Source
This commit is contained in:
Stefan Ceriu
2021-07-12 15:30:48 +03:00
parent 4224609839
commit 6f9cfaa0b5
3 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackController.swift
+10 -36
View File
@@ -37,7 +37,8 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
}()
private let cacheManager: VoiceMessageAttachmentCacheManager
private let mediaServiceProvider: VoiceMessageMediaServiceProvider
private let audioPlayer: VoiceMessageAudioPlayer
private var displayLink: CADisplayLink!
private var samples: [Float] = []
private var duration: TimeInterval = 0
@@ -46,9 +47,6 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
private var state: VoiceMessagePlaybackControllerState = .stopped {
didSet {
if state == .stopped || state == .error {
mediaServiceProvider.audioPlayer.deregisterDelegate(self)
}
updateUI()
displayLink.isPaused = (state != .playing)
}
@@ -59,10 +57,11 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
init(mediaServiceProvider: VoiceMessageMediaServiceProvider,
cacheManager: VoiceMessageAttachmentCacheManager) {
self.cacheManager = cacheManager
self.mediaServiceProvider = mediaServiceProvider
playbackView = VoiceMessagePlaybackView.loadFromNib()
audioPlayer = mediaServiceProvider.audioPlayer()
audioPlayer.registerDelegate(self)
playbackView.delegate = self
displayLink = CADisplayLink(target: WeakTarget(self, selector: #selector(handleDisplayLinkTick)), selector: WeakTarget.triggerSelector)
@@ -83,29 +82,16 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
// MARK: - VoiceMessagePlaybackViewDelegate
func voiceMessagePlaybackViewDidRequestPlaybackToggle() {
if mediaServiceProvider.mediaIdentifier == attachment?.eventId {
if mediaServiceProvider.audioPlayer.isPlaying {
mediaServiceProvider.audioPlayer.pause()
} else {
mediaServiceProvider.audioPlayer.registerDelegate(self)
mediaServiceProvider.audioPlayer.play()
}
if audioPlayer.isPlaying {
audioPlayer.pause()
} else {
if let url = urlToLoad {
mediaServiceProvider.mediaIdentifier = attachment?.eventId
mediaServiceProvider.audioPlayer.registerDelegate(self)
mediaServiceProvider.audioPlayer.loadContentFromURL(url)
mediaServiceProvider.audioPlayer.play()
}
audioPlayer.play()
}
}
// MARK: - VoiceMessageAudioPlayerDelegate
func audioPlayerDidFinishLoading(_ audioPlayer: VoiceMessageAudioPlayer) {
if audioPlayer.url != self.urlToLoad {
state = .stopped
}
updateUI()
}
@@ -149,8 +135,8 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
details.currentTime = VoiceMessagePlaybackController.timeFormatter.string(from: Date(timeIntervalSinceReferenceDate: self.duration))
details.progress = 0.0
default:
details.currentTime = VoiceMessagePlaybackController.timeFormatter.string(from: Date(timeIntervalSinceReferenceDate: mediaServiceProvider.audioPlayer.currentTime))
details.progress = (mediaServiceProvider.audioPlayer.duration > 0.0 ? mediaServiceProvider.audioPlayer.currentTime / mediaServiceProvider.audioPlayer.duration : 0.0)
details.currentTime = VoiceMessagePlaybackController.timeFormatter.string(from: Date(timeIntervalSinceReferenceDate: audioPlayer.currentTime))
details.progress = (audioPlayer.duration > 0.0 ? audioPlayer.currentTime / audioPlayer.duration : 0.0)
}
details.loading = self.loading
@@ -162,7 +148,6 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
return
}
mediaServiceProvider.audioPlayer.deregisterDelegate(self)
self.state = .stopped
self.loading = true
self.samples = []
@@ -178,21 +163,10 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
}
self.loading = false
self.urlToLoad = result.1
self.audioPlayer.loadContentFromURL(result.1)
self.duration = result.2
self.samples = result.3
if self.mediaServiceProvider.mediaIdentifier == self.attachment?.eventId {
self.mediaServiceProvider.audioPlayer.registerDelegate(self)
if self.mediaServiceProvider.audioPlayer.isPlaying {
self.state = .playing
} else if self.mediaServiceProvider.audioPlayer.currentTime > 0 {
self.state = .paused
} else {
self.state = .stopped
}
}
self.updateUI()
case .failure:
self.state = .error