Archived
2
0

Revert "remove broadcast Config"

This reverts commit 88c0337a16.
This commit is contained in:
m1k1o 2020-09-27 12:06:13 +02:00
parent 1977e017dc
commit de04cac28e
4 changed files with 44 additions and 2 deletions

View File

@ -20,6 +20,7 @@ func init() {
neko.Service.Server, neko.Service.Server,
neko.Service.WebRTC, neko.Service.WebRTC,
neko.Service.Remote, neko.Service.Remote,
neko.Service.Broadcast,
neko.Service.WebSocket, neko.Service.WebSocket,
} }

View File

@ -12,14 +12,16 @@ type BroadcastManager struct {
logger zerolog.Logger logger zerolog.Logger
pipeline *gst.Pipeline pipeline *gst.Pipeline
remote *config.Remote remote *config.Remote
config *config.Broadcast
enabled bool enabled bool
url string url string
} }
func New(remote *config.Remote) *BroadcastManager { func New(remote *config.Remote, config *config.Broadcast) *BroadcastManager {
return &BroadcastManager{ return &BroadcastManager{
logger: log.With().Str("module", "remote").Logger(), logger: log.With().Str("module", "remote").Logger(),
remote: remote, remote: remote,
config: config,
enabled: false, enabled: false,
url: "", url: "",
} }

View File

@ -0,0 +1,37 @@
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")
}

View File

@ -62,6 +62,7 @@ func init() {
Root: &config.Root{}, Root: &config.Root{},
Server: &config.Server{}, Server: &config.Server{},
Remote: &config.Remote{}, Remote: &config.Remote{},
Broadcast: &config.Broadcast{},
WebRTC: &config.WebRTC{}, WebRTC: &config.WebRTC{},
WebSocket: &config.WebSocket{}, WebSocket: &config.WebSocket{},
} }
@ -100,6 +101,7 @@ type Neko struct {
Version *Version Version *Version
Root *config.Root Root *config.Root
Remote *config.Remote Remote *config.Remote
Broadcast *config.Broadcast
Server *config.Server Server *config.Server
WebRTC *config.WebRTC WebRTC *config.WebRTC
WebSocket *config.WebSocket WebSocket *config.WebSocket
@ -118,7 +120,7 @@ func (neko *Neko) Preflight() {
} }
func (neko *Neko) Start() { func (neko *Neko) Start() {
broadcastManager := broadcast.New(neko.Remote) broadcastManager := broadcast.New(neko.Remote, neko.Broadcast)
remoteManager := remote.New(neko.Remote, broadcastManager) remoteManager := remote.New(neko.Remote, broadcastManager)
remoteManager.Start() remoteManager.Start()