Opt: del channle name

zijiren233 · Oct 19, 2023 · c0062f0 · c0062f0
1 parent b4de437
commit c0062f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cmd/server.go b/cmd/server.go
@@ -38,7 +38,7 @@ func Server(cmd *cobra.Command, args []string) {
 	tcp := muxer.Match(cmux.Any())
 	channels := rwmap.RWMap[string, *server.Channel]{}
 	s := server.NewRtmpServer(func(ReqAppName, ReqChannelName string, IsPublisher bool) (*server.Channel, error) {
-		c, _ := channels.LoadOrStore(ReqAppName, server.NewChannel(ReqAppName))
+		c, _ := channels.LoadOrStore(ReqAppName, server.NewChannel())
 		c.InitHlsPlayer()
 		return c, nil
 	})

diff --git a/server/channel.go b/server/channel.go
@@ -14,7 +14,6 @@ import (
 )
 
 type Channel struct {
-	channelName   string
 	inPublication uint32
 	players       rwmap.RWMap[av.WriteCloser, *packWriter]
 
@@ -27,10 +26,8 @@ type Channel struct {
 
 type ChannelConf func(*Channel)
 
-func NewChannel(channelName string, conf ...ChannelConf) *Channel {
-	ch := &Channel{
-		channelName: channelName,
-	}
+func NewChannel(conf ...ChannelConf) *Channel {
+	ch := &Channel{}
 	for _, c := range conf {
 		c(ch)
 	}