Merge pull request #44 from viruslox/rename-discord-out-to-streaming-12182171069941924446

Rename Discord discord_out configuration to streaming

Author: viruslox

cmd/chatbridge/main.go

@@ -48,7 +48,7 @@ func main() {
 	log.Printf("Overlay Chat HTML: %v", cfg.Overlay.Chat.HTML)
 	log.Printf("Overlay Chat Discord: %v", cfg.Overlay.Chat.Discord)
 	log.Printf("Overlay Chat Streaming: %v", cfg.Overlay.Chat.Streaming)
-	log.Printf("Discord Out (Capture): %v", cfg.Discord.DiscordOut)
+	log.Printf("Discord Streaming (Capture): %v", cfg.Discord.Streaming)
 	log.Printf("AudioSource Enable: %v", cfg.AudioSource.Enable)
 	log.Printf("AudioSource Discord: %v", cfg.AudioSource.Discord)
 	log.Printf("AudioSource Streaming: %v", cfg.AudioSource.Streaming)

config/chatbridge.settings.template

@@ -70,15 +70,15 @@ discord:
   prefix: "vlx."       # Commands prefix (es. !join, !leave)
   guild_id: "<discord server id>" # Optional, but suggested: Restrict to specific Guild ID
   # enable or disable the capture of discord voice channel audio via streaming module (SRT)
-  discord_out: yes
+  streaming: yes
   # List of Discord User IDs of voice channels partecipante to mute on streaming module 
   excluded_users:
     - "<discord user id>"
     - "<discord user id>"
 
 streaming:
   # SRT Destination (e.g., MediaMTX) # mode=caller to enable "us" as media sender 
-  # <channel> is placeholder for overlay_<name>, audio_source, discord_out
+  # <channel> is placeholder for overlay_<name>, audio_source, discord_streaming
   destination_url: "srt://127.0.0.1:8890?streamid=publish:ChatBridge/<channel>:<srt user>:<srt pass>&mode=caller&pkt_size=1316"
   bitrate: "128k" # Audio output Bitrate for FFmpeg
   volume: 75    # 0-100, in percentage

internal/core/config/config.go

@@ -109,7 +109,7 @@ type DiscordConfig struct {
 	Prefix        string   `yaml:"prefix"`
 	Admins        []string `yaml:"admins"`
 	GuildID       string   `yaml:"guild_id"`
-	DiscordOut    YesNoBool     `yaml:"discord_out"`
+	Streaming     YesNoBool     `yaml:"streaming"`
 	ExcludedUsers []string `yaml:"excluded_users"`
 }
 

internal/modules/audiobridge/bot/discord.go

@@ -27,17 +27,17 @@ type DiscordBot struct {
 	client          *bot.Client
 	controller      module.Controller
 	pendingShutdown map[snowflake.ID]snowflake.ID // channelID -> authorID
-	discordOutEnabled bool
+	discordStreamingEnabled bool
 	excludedUsers []string
 }
 
-func NewBot(token string, prefix string, admins []string, discordOutEnabled bool, excludedUsers []string, ctrl module.Controller) *DiscordBot {
+func NewBot(token string, prefix string, admins []string, discordStreamingEnabled bool, excludedUsers []string, ctrl module.Controller) *DiscordBot {
 	return &DiscordBot{
 		token:           token,
 		prefix:          prefix,
 		admins:          admins,
 		controller:      ctrl,
-		discordOutEnabled: discordOutEnabled,
+		discordStreamingEnabled: discordStreamingEnabled,
 		excludedUsers: excludedUsers,
 		pendingShutdown: make(map[snowflake.ID]snowflake.ID),
 	}
@@ -163,7 +163,7 @@ func (b *DiscordBot) onMessageCreate(event *events.MessageCreate) {
 				log.Printf("[AudioBridge] Failed to join voice channel %s: %v", channelID, err)
 				return
 			}
-			conn.SetOpusFrameReceiver(NewDiscordOpusReceiver(b.discordOutEnabled, b.excludedUsers))
+			conn.SetOpusFrameReceiver(NewDiscordOpusReceiver(b.discordStreamingEnabled, b.excludedUsers))
 			log.Printf("[AudioBridge] Joined voice channel %s successfully.", channelID)
 		}()
 

internal/modules/audiobridge/bot/receiver.go

@@ -13,11 +13,11 @@ import (
 
 type DiscordOpusReceiver struct {
 	decoder *opus.Decoder
-	configDiscordOut bool
+	configDiscordStreaming bool
 	excludedUsers map[string]struct{}
 }
 
-func NewDiscordOpusReceiver(discordOutEnabled bool, excludedUsersList []string) *DiscordOpusReceiver {
+func NewDiscordOpusReceiver(discordStreamingEnabled bool, excludedUsersList []string) *DiscordOpusReceiver {
 	// Discord sends 48kHz, 2 channels
 	decoder, err := opus.NewDecoder(48000, 2)
 	excludedMap := make(map[string]struct{})
@@ -27,17 +27,17 @@ func NewDiscordOpusReceiver(discordOutEnabled bool, excludedUsersList []string)
 
 	if err != nil {
 		log.Printf("[AudioBridge] Failed to create Opus decoder: %v", err)
-		return &DiscordOpusReceiver{configDiscordOut: discordOutEnabled, excludedUsers: excludedMap}
+		return &DiscordOpusReceiver{configDiscordStreaming: discordStreamingEnabled, excludedUsers: excludedMap}
 	}
 	return &DiscordOpusReceiver{
 		decoder: decoder,
-		configDiscordOut: discordOutEnabled,
+		configDiscordStreaming: discordStreamingEnabled,
 		excludedUsers: excludedMap,
 	}
 }
 
 func (r *DiscordOpusReceiver) ReceiveOpusFrame(userID snowflake.ID, packet *voice.Packet) error {
-	if !r.configDiscordOut {
+	if !r.configDiscordStreaming {
 		return nil
 	}
 

internal/modules/audiobridge/module.go

@@ -49,8 +49,8 @@ func (m *Module) Start() error {
 		log.Printf("[AudioBridge] Internal audio pipe start error: %v", err)
 	}
 
-	discordOut := m.config.Discord.DiscordOut
-	m.bot = bot.NewBot(m.config.Discord.Token, m.config.Discord.Prefix, m.config.Discord.Admins, bool(discordOut), m.config.Discord.ExcludedUsers, m.controller)
+	discordStreaming := m.config.Discord.Streaming
+	m.bot = bot.NewBot(m.config.Discord.Token, m.config.Discord.Prefix, m.config.Discord.Admins, bool(discordStreaming), m.config.Discord.ExcludedUsers, m.controller)
 	if err := m.bot.Connect(); err != nil {
 		log.Printf("[AudioBridge] Discord bot connect error: %v", err)
 	}