From 88c0337a164345d269364fb2819fe0916b3c2873 Mon Sep 17 00:00:00 2001 From: m1k1o Date: Sun, 27 Sep 2020 01:34:33 +0200 Subject: [PATCH] remove broadcast Config --- server/cmd/serve.go | 1 - server/internal/broadcast/manager.go | 4 +-- server/internal/types/config/broadcast.go | 37 ----------------------- server/neko.go | 4 +-- 4 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 server/internal/types/config/broadcast.go diff --git a/server/cmd/serve.go b/server/cmd/serve.go index b6a78077..2c7dfde5 100644 --- a/server/cmd/serve.go +++ b/server/cmd/serve.go @@ -20,7 +20,6 @@ func init() { neko.Service.Server, neko.Service.WebRTC, neko.Service.Remote, - neko.Service.Broadcast, neko.Service.WebSocket, } diff --git a/server/internal/broadcast/manager.go b/server/internal/broadcast/manager.go index bca83cf7..8937ffab 100644 --- a/server/internal/broadcast/manager.go +++ b/server/internal/broadcast/manager.go @@ -12,16 +12,14 @@ type BroadcastManager struct { logger zerolog.Logger pipeline *gst.Pipeline remote *config.Remote - config *config.Broadcast enabled bool url string } -func New(remote *config.Remote, config *config.Broadcast) *BroadcastManager { +func New(remote *config.Remote) *BroadcastManager { return &BroadcastManager{ logger: log.With().Str("module", "remote").Logger(), remote: remote, - config: config, enabled: false, url: "", } diff --git a/server/internal/types/config/broadcast.go b/server/internal/types/config/broadcast.go deleted file mode 100644 index f9284486..00000000 --- a/server/internal/types/config/broadcast.go +++ /dev/null @@ -1,37 +0,0 @@ -package config - -import ( - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -type Broadcast struct { - // Enabled bool - // AudioParams string - // VideoParams string -} - -func (Broadcast) Init(cmd *cobra.Command) error { - // cmd.PersistentFlags().Bool("broadcast", false, "enable boradcasting") - // if err := viper.BindPFlag("broadcast", cmd.PersistentFlags().Lookup("broadcast")); err != nil { - // return err - // } - - // cmd.PersistentFlags().String("cast_audio", "", "audio codec parameters to use for broadcasting") - // if err := viper.BindPFlag("cast_audio", cmd.PersistentFlags().Lookup("cast_audio")); err != nil { - // return err - // } - - // cmd.PersistentFlags().String("cast_video", "", "video codec parameters to use for broadcasting") - // if err := viper.BindPFlag("cast_video", cmd.PersistentFlags().Lookup("cast_video")); err != nil { - // return err - // } - - return nil -} - -func (s *Broadcast) Set() { - // s.Enabled = viper.GetBool("broadcast") - // s.AudioParams = viper.GetString("cast_audio") - // s.VideoParams = viper.GetString("cast_video") -} diff --git a/server/neko.go b/server/neko.go index 6c3d6163..7d4dabbe 100644 --- a/server/neko.go +++ b/server/neko.go @@ -62,7 +62,6 @@ func init() { Root: &config.Root{}, Server: &config.Server{}, Remote: &config.Remote{}, - Broadcast: &config.Broadcast{}, WebRTC: &config.WebRTC{}, WebSocket: &config.WebSocket{}, } @@ -101,7 +100,6 @@ type Neko struct { Version *Version Root *config.Root Remote *config.Remote - Broadcast *config.Broadcast Server *config.Server WebRTC *config.WebRTC WebSocket *config.WebSocket @@ -120,7 +118,7 @@ func (neko *Neko) Preflight() { } func (neko *Neko) Start() { - broadcastManager := broadcast.New(neko.Remote, neko.Broadcast) + broadcastManager := broadcast.New(neko.Remote) remoteManager := remote.New(neko.Remote, broadcastManager) remoteManager.Start()