Skip to content

Commit

Permalink
Do not start udp listener if deaf.
Browse files Browse the repository at this point in the history
If you call VoiceChannelJoin and set deaf to true
then the library will not start a udp listener
  • Loading branch information
bwmarrin committed Apr 26, 2016
1 parent 77d4767 commit 4cac19c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 9 additions & 5 deletions voice.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ type VoiceConnection struct {

Debug bool // If true, print extra logging
Ready bool // If true, voice is ready to send/receive audio
UserID string
GuildID string
ChannelID string
UserID string
deaf bool
mute bool

OpusSend chan []byte // Chan for sending opus audio
OpusRecv chan *Packet // Chan for receiving opus audio
Expand Down Expand Up @@ -356,11 +358,13 @@ func (v *VoiceConnection) wsEvent(messageType int, message []byte) {
go v.opusSender(v.udpConn, v.close, v.OpusSend, 48000, 960)

// Start the opusReceiver
if v.OpusRecv == nil {
v.OpusRecv = make(chan *Packet, 2)
}
if !v.deaf {
if v.OpusRecv == nil {
v.OpusRecv = make(chan *Packet, 2)
}

go v.opusReceiver(v.udpConn, v.close, v.OpusRecv)
go v.opusReceiver(v.udpConn, v.close, v.OpusRecv)
}

// Send the ready event
v.connected <- true
Expand Down
2 changes: 2 additions & 0 deletions wsapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool) (voice *Voi
voice = &VoiceConnection{
GuildID: gID,
ChannelID: cID,
deaf: deaf,
mute: mute,
session: s,
connected: make(chan bool),
sessionRecv: make(chan string),
Expand Down

0 comments on commit 4cac19c

Please sign in to comment.