Muting a channel now stops you from transmitting, it acts sort of like deafen.

barnard.go

@@ -1,38 +1,138 @@
 package main
 
 import (
-	"crypto/tls"
+    "crypto/tls"
 
-	"git.stormux.org/storm/barnard/config"
-	"git.stormux.org/storm/barnard/gumble/gumble"
-	"git.stormux.org/storm/barnard/gumble/gumbleopenal"
-	"git.stormux.org/storm/barnard/uiterm"
+    "git.stormux.org/storm/barnard/config"
+    "git.stormux.org/storm/barnard/gumble/gumble"
+    "git.stormux.org/storm/barnard/gumble/gumbleopenal"
+    "git.stormux.org/storm/barnard/uiterm"
 )
 
-type Barnard struct {
-	Config     *gumble.Config
-	UserConfig *config.Config
-	Hotkeys    *config.Hotkeys
-	Client     *gumble.Client
-
-	Address   string
-	TLSConfig tls.Config
-
-	Stream    *gumbleopenal.Stream
-	Tx        bool
-	Connected bool
-
-	Ui              *uiterm.Ui
-	UiOutput        uiterm.Textview
-	UiInput         uiterm.Textbox
-	UiStatus        uiterm.Label
-	UiTree          uiterm.Tree
-	UiInputStatus   uiterm.Label
-	SelectedChannel *gumble.Channel
-	selectedUser    *gumble.User
-
-	notifyChannel chan []string
-
-	exitStatus  int
-	exitMessage string
+type TreeItem struct {
+    User    *gumble.User
+    Channel *gumble.Channel
+}
+
+type Barnard struct {
+    Config     *gumble.Config
+    UserConfig *config.Config
+    Hotkeys    *config.Hotkeys
+    Client     *gumble.Client
+
+    Address   string
+    TLSConfig tls.Config
+
+    Stream    *gumbleopenal.Stream
+    Tx        bool
+    Connected bool
+
+    Ui              *uiterm.Ui
+    UiOutput        uiterm.Textview
+    UiInput         uiterm.Textbox
+    UiStatus        uiterm.Label
+    UiTree          uiterm.Tree
+    UiInputStatus   uiterm.Label
+    SelectedChannel *gumble.Channel
+    selectedUser    *gumble.User
+
+    notifyChannel chan []string
+
+    exitStatus  int
+    exitMessage string
+
+    // Added for channel muting
+    MutedChannels map[uint32]bool
+}
+
+func (b *Barnard) StopTransmission() {
+    if b.Tx {
+        b.Notify("micdown", "me", "")
+        b.Tx = false
+        b.UpdateGeneralStatus(" Idle ", false)
+        b.Stream.StopSource()
+    }
+}
+
+func (b *Barnard) TreeItemCharacter(ui *uiterm.Ui, tree *uiterm.Tree, item uiterm.TreeItem, ch rune) {
+}
+
+func (b *Barnard) TreeItemKeyPress(ui *uiterm.Ui, tree *uiterm.Tree, item uiterm.TreeItem, key uiterm.Key) {
+    treeItem := item.(TreeItem)
+    if key == uiterm.KeyEnter {
+        if treeItem.Channel != nil {
+            b.Client.Self.Move(treeItem.Channel)
+            b.SetSelectedUser(nil)
+            b.GotoChat()
+        }
+        if treeItem.User != nil {
+            if b.selectedUser == treeItem.User {
+                b.SetSelectedUser(nil)
+                b.GotoChat()
+            } else {
+                b.SetSelectedUser(treeItem.User)
+                b.GotoChat()
+            }
+        }
+    }
+
+    // Handle mute toggle
+    if treeItem.Channel != nil {
+        if key == *b.Hotkeys.MuteToggle {
+            // Toggle mute for all users in channel
+            users := makeUsersArray(treeItem.Channel.Users)
+            for _, u := range users {
+                b.UserConfig.ToggleMute(u)
+                if u.AudioSource != nil {
+                    if u.LocallyMuted {
+                        u.AudioSource.SetGain(0)
+                    } else {
+                        u.AudioSource.SetGain(u.Volume)
+                    }
+                }
+            }
+
+            // Toggle channel mute state
+            if b.MutedChannels[treeItem.Channel.ID] {
+                delete(b.MutedChannels, treeItem.Channel.ID)
+            } else {
+                b.MutedChannels[treeItem.Channel.ID] = true
+                // If this is the current channel, stop transmission
+                if b.Client.Self.Channel.ID == treeItem.Channel.ID && b.Tx {
+                    b.StopTransmission()
+                }
+            }
+
+            b.UiTree.Rebuild()
+            b.Ui.Refresh()
+        }
+        if key == *b.Hotkeys.VolumeDown {
+            b.changeVolume(makeUsersArray(treeItem.Channel.Users), -0.1)
+        }
+        if key == *b.Hotkeys.VolumeUp {
+            b.changeVolume(makeUsersArray(treeItem.Channel.Users), 0.1)
+        }
+    }
+
+    if treeItem.User != nil {
+        if key == *b.Hotkeys.MuteToggle {
+            // Toggle mute for single user
+            b.UserConfig.ToggleMute(treeItem.User)
+            if treeItem.User.AudioSource != nil {
+                if treeItem.User.LocallyMuted {
+                    treeItem.User.AudioSource.SetGain(0)
+                } else {
+                    treeItem.User.AudioSource.SetGain(treeItem.User.Volume)
+                }
+            }
+            b.UiTree.Rebuild()
+            b.Ui.Refresh()
+        }
+        if key == *b.Hotkeys.VolumeDown {
+            b.changeVolume([]*gumble.User{treeItem.User}, -0.1)
+        }
+        if key == *b.Hotkeys.VolumeUp {
+            b.changeVolume([]*gumble.User{treeItem.User}, 0.1)
+        }
+    }
 }