signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

minimize sound overlap

Browse Source 
Because there is some asynchrony involved, there may be a blip during
the switch between sounds/audio sessions

// FREEBIE
This commit is contained in:
Michael Kirk 2017-07-14 18:50:02 -04:00
parent e3faddedbc
commit fb5c17a6b4
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Signal/src/call/CallAudioService.swift
View File

@ -238,14 +238,11 @@ struct AudioSource: Hashable {
Logger.verbose("\(TAG) in \(#function) new state: \(call.state)")
// Stop playing sounds while switching audio session so we don't
// get any blips across a temporary unintended route.
stopPlayingAnySounds()
self.ensureProperAudioSession(call: call)
let session = AVAudioSession.sharedInstance()
Logger.verbose("\(TAG) in \(#function) session.category: \(session.category)")
Logger.verbose("\(TAG) in \(#function) session.categoryOptions: \(session.categoryOptions)")
Logger.verbose("\(TAG) in \(#function) session.preferredInput: \(session.preferredInput)")
Logger.verbose("\(TAG) in \(#function) session.availableInputs: \(session.availableInputs)")
switch call.state {
case .idle: handleIdle(call: call)
case .dialing: handleDialing(call: call)
@ -278,16 +275,12 @@ struct AudioSource: Hashable {
private func handleAnswering(call: SignalCall) {
Logger.debug("\(TAG) \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
}
private func handleRemoteRinging(call: SignalCall) {
Logger.debug("\(TAG) \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
// FIXME if you toggled speakerphone before this point, the outgoing ring does not play through speaker. Why?
self.play(sound: Sound.outgoingRing)
}
@ -296,23 +289,18 @@ struct AudioSource: Hashable {
Logger.debug("\(TAG) in \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
startRinging(call: call)
}
private func handleConnected(call: SignalCall) {
Logger.debug("\(TAG) \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
}
private func handleLocalFailure(call: SignalCall) {
Logger.debug("\(TAG) \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
play(sound: Sound.failure)
}
@ -336,9 +324,8 @@ struct AudioSource: Hashable {
Logger.debug("\(TAG) \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
play(sound: Sound.busy)
// Let the busy sound play for 4 seconds. The full file is longer than necessary
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 4.0) {
self.handleCallEnded(call: call)
@ -349,8 +336,6 @@ struct AudioSource: Hashable {
Logger.debug("\(TAG) \(#function)")
AssertIsOnMainThread()
stopPlayingAnySounds()
// Stop solo audio, revert to default.
setAudioSession(category: AVAudioSessionCategoryAmbient)
}