stryan/mumble-discord-bridge
1
0
Fork 0
mirror of https://github.com/stryan/mumble-discord-bridge.git synced 2024-11-23 05:45:41 -05:00
Code Issues Releases Wiki Activity

dsicord timeout

Browse Source 
suppress repeating discord errors
This commit is contained in:
Tyler Stiene 2020-11-11 22:57:51 -05:00
parent fa3d5cf917
commit dfab413f87
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
discord.go
View File

@ -36,7 +36,7 @@ var OnError = func(str string, err error) {
// SendPCM will receive on the provied channel encode // SendPCM will receive on the provied channel encode
// received PCM data into Opus then send that to Discordgo // received PCM data into Opus then send that to Discordgo
func discordSendPCM(v *discordgo.VoiceConnection, pcm <-chan []int16) { func discordSendPCM(v *discordgo.VoiceConnection, pcm <-chan []int16, die chan bool) {
const channels int = 1 const channels int = 1
const frameRate int = 48000 // audio sampling rate const frameRate int = 48000 // audio sampling rate
const frameSize int = 960 // uint16 size of each audio frame const frameSize int = 960 // uint16 size of each audio frame
@ -52,6 +52,9 @@ func discordSendPCM(v *discordgo.VoiceConnection, pcm <-chan []int16) {
ticker := time.NewTicker(20 * time.Millisecond) ticker := time.NewTicker(20 * time.Millisecond)
lastReady := true
var readyTimeout *time.Timer
for { for {
<-ticker.C <-ticker.C
@ -72,8 +75,18 @@ func discordSendPCM(v *discordgo.VoiceConnection, pcm <-chan []int16) {
} }
if v.Ready == false || v.OpusSend == nil { if v.Ready == false || v.OpusSend == nil {
if lastReady == true {
OnError(fmt.Sprintf("Discordgo not ready for opus packets. %+v : %+v", v.Ready, v.OpusSend), nil) OnError(fmt.Sprintf("Discordgo not ready for opus packets. %+v : %+v", v.Ready, v.OpusSend), nil)
readyTimeout = time.AfterFunc(30*time.Second, func() {
die <- true
})
lastReady = false
}
continue continue
} else if lastReady == false {
fmt.Println("Discordgo ready to send opus packets")
lastReady = true
readyTimeout.Stop()
} }
v.OpusSend <- opus v.OpusSend <- opus
@ -88,13 +101,26 @@ func discordSendPCM(v *discordgo.VoiceConnection, pcm <-chan []int16) {
// ReceivePCM will receive on the the Discordgo OpusRecv channel and decode // ReceivePCM will receive on the the Discordgo OpusRecv channel and decode
// the opus audio into PCM then send it on the provided channel. // the opus audio into PCM then send it on the provided channel.
func discordReceivePCM(v *discordgo.VoiceConnection) { func discordReceivePCM(v *discordgo.VoiceConnection, die chan bool) {
var err error var err error
lastReady := true
var readyTimeout *time.Timer
for { for {
if v.Ready == false || v.OpusRecv == nil { if v.Ready == false || v.OpusRecv == nil {
if lastReady == true {
OnError(fmt.Sprintf("Discordgo not to receive opus packets. %+v : %+v", v.Ready, v.OpusSend), nil) OnError(fmt.Sprintf("Discordgo not to receive opus packets. %+v : %+v", v.Ready, v.OpusSend), nil)
readyTimeout = time.AfterFunc(30*time.Second, func() {
die <- true
})
lastReady = false
}
continue continue
} else if lastReady == false {
fmt.Println("Discordgo ready to receive packets")
lastReady = true
readyTimeout.Stop()
} }
p, ok := <-v.OpusRecv p, ok := <-v.OpusRecv

4
main.go
View File

@ -144,9 +144,9 @@ func main() {
go m.fromMumbleMixer(toDiscord) go m.fromMumbleMixer(toDiscord)
config.AudioListeners.Attach(m) config.AudioListeners.Attach(m)
//Discord //Discord
go discordReceivePCM(dgv) go discordReceivePCM(dgv, die)
go fromDiscordMixer(toMumble) go fromDiscordMixer(toMumble)
go discordSendPCM(dgv, toDiscord) go discordSendPCM(dgv, toDiscord, die)
// Wait for Exit Signal // Wait for Exit Signal
c := make(chan os.Signal) c := make(chan os.Signal)