name confusion Enabled -> Started.

This commit is contained in:
Miroslav Šedivý
2021-02-05 14:03:53 +01:00
parent 18b6fa0a03
commit 36b7eca43c
6 changed files with 25 additions and 25 deletions

View File

@ -16,7 +16,7 @@ type BroacastManagerCtx struct {
mu sync.Mutex
pipelineStr string
pipeline *gst.Pipeline
enabled bool
started bool
url string
}
@ -24,7 +24,7 @@ func broadcastNew(pipelineStr string) *BroacastManagerCtx {
return &BroacastManagerCtx{
logger: log.With().Str("module", "capture").Str("submodule", "broadcast").Logger(),
pipelineStr: pipelineStr,
enabled: false,
started: false,
url: "",
}
}
@ -45,7 +45,7 @@ func (manager *BroacastManagerCtx) Start(url string) error {
}
manager.url = url
manager.enabled = true
manager.started = true
return nil
}
@ -53,12 +53,12 @@ func (manager *BroacastManagerCtx) Stop() {
manager.mu.Lock()
defer manager.mu.Unlock()
manager.enabled = false
manager.started = false
manager.destroyPipeline()
}
func (manager *BroacastManagerCtx) Enabled() bool {
return manager.enabled
func (manager *BroacastManagerCtx) Started() bool {
return manager.started
}
func (manager *BroacastManagerCtx) Url() string {

View File

@ -70,18 +70,18 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt
}
func (manager *CaptureManagerCtx) Start() {
if manager.broadcast.Enabled() {
if manager.broadcast.Started() {
if err := manager.broadcast.createPipeline(); err != nil {
manager.logger.Panic().Err(err).Msg("unable to create broadcast pipeline")
}
}
manager.desktop.OnBeforeScreenSizeChange(func() {
if manager.video.Enabled() {
if manager.video.Started() {
manager.video.destroyPipeline()
}
if manager.broadcast.Enabled() {
if manager.broadcast.Started() {
manager.broadcast.destroyPipeline()
}
@ -91,13 +91,13 @@ func (manager *CaptureManagerCtx) Start() {
})
manager.desktop.OnAfterScreenSizeChange(func() {
if manager.video.Enabled() {
if manager.video.Started() {
if err := manager.video.createPipeline(); err != nil {
manager.logger.Panic().Err(err).Msg("unable to recreate video pipeline")
}
}
if manager.broadcast.Enabled() {
if manager.broadcast.Started() {
if err := manager.broadcast.createPipeline(); err != nil {
manager.logger.Panic().Err(err).Msg("unable to recreate broadcast pipeline")
}

View File

@ -23,7 +23,7 @@ type StreamManagerCtx struct {
emmiter events.EventEmmiter
emitUpdate chan bool
emitStop chan bool
enabled bool
started bool
}
func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx {
@ -34,7 +34,7 @@ func streamNew(codec codec.RTPCodec, pipelineStr string) *StreamManagerCtx {
emmiter: events.New(),
emitUpdate: make(chan bool),
emitStop: make(chan bool),
enabled: false,
started: false,
}
go func() {
@ -82,7 +82,7 @@ func (manager *StreamManagerCtx) Start() error {
return err
}
manager.enabled = true
manager.started = true
return nil
}
@ -90,12 +90,12 @@ func (manager *StreamManagerCtx) Stop() {
manager.mu.Lock()
defer manager.mu.Unlock()
manager.enabled = false
manager.started = false
manager.destroyPipeline()
}
func (manager *StreamManagerCtx) Enabled() bool {
return manager.enabled
func (manager *StreamManagerCtx) Started() bool {
return manager.started
}
func (manager *StreamManagerCtx) createPipeline() error {