Few minor bugfixes

Author: xaionaro

cmd/streampanel/FyneApp.toml

@@ -5,4 +5,4 @@ Website = "https://github.com/xaionaro/streamctl"
   Name = "streampanel"
   ID = "center.dx.streampanel"
   Version = "0.1.0"
-  Build = 350
+  Build = 360

pkg/streampanel/dashboard.go

@@ -222,7 +222,8 @@ func (w *dashboardWindow) imagesLayer(width, height int) (_ret image.Image) {
 	ctx := context.TODO()
 	logger.Tracef(ctx, "imagesLayer(%d, %d)", width, height)
 	defer func() { logger.Tracef(ctx, "/imagesLayer(%d, %d): size:%v", width, height, _ret.Bounds()) }()
-	return xsync.DoR1(xsync.WithNoLogging(ctx, true), &w.imagesLocker, func() image.Image {
+	ctx = xsync.WithNoLogging(ctx, true)
+	return xsync.DoR1(ctx, &w.imagesLocker, func() image.Image {
 		return w.renderImagesNoLock(ctx, width, height)
 	})
 }
@@ -259,6 +260,7 @@ func (w *dashboardWindow) renderImagesNoLock(
 
 	canvasRatio := float64(dstSize.X) / float64(dstSize.Y)
 
+	logger.Tracef(ctx, "len(w.changedImages) == %d", len(w.changedImages))
 	imgIsChanged := map[string]struct{}{}
 	for _, img := range w.changedImages {
 		if dashboardDebug {
@@ -577,7 +579,7 @@ func (w *dashboardWindow) startUpdatingNoLock(
 		w.renderStreamStatus(ctx)
 
 		observability.Go(ctx, func() {
-			t := time.NewTicker(500 * time.Millisecond)
+			t := time.NewTicker(1000 * time.Millisecond)
 			for {
 				select {
 				case <-ctx.Done():
@@ -645,8 +647,8 @@ func (w *dashboardWindow) updateImages(
 	ctx context.Context,
 	dashboardCfg streamdconfig.DashboardConfig,
 ) {
-	logger.Tracef(ctx, "updateImages")
-	defer logger.Tracef(ctx, "/updateImages")
+	logger.Debugf(ctx, "updateImages")
+	defer logger.Debugf(ctx, "/updateImages")
 
 	w.dashboardLocker.Do(ctx, func() {
 		w.updateImagesNoLock(ctx, dashboardCfg)
@@ -772,12 +774,9 @@ func (w *dashboardWindow) updateImagesNoLock(
 		if !changed && lastWinSize == winSize && lastOrientation == orientation {
 			return
 		}
-		logger.Tracef(
-			ctx,
+		logger.Tracef(ctx,
 			"updating the screenshot image: %v %#+v %#+v",
-			changed,
-			lastWinSize,
-			winSize,
+			changed, lastWinSize, winSize,
 		)
 		b := img.Bounds()
 		m := image.NewNRGBA(image.Rect(0, 0, b.Dx(), b.Dy()))
@@ -787,18 +786,27 @@ func (w *dashboardWindow) updateImagesNoLock(
 			el = elementsMap[screenshotElementName]
 			el.Image = m
 		})
+		logger.Tracef(ctx, "push screenshot to changedElements")
 		changedElements <- el
 	})
-	w.changedImages = w.changedImages[:0]
+
+	var receiverWG sync.WaitGroup
 	changedCount := 0
-	go func() {
-		for el := range changedElements {
-			changedCount++
-			w.changedImages = append(w.changedImages, el)
-		}
-	}()
+	w.imagesLocker.Do(xsync.WithNoLogging(ctx, true), func() {
+		w.changedImages = w.changedImages[:0]
+		receiverWG.Add(1)
+		go func() {
+			defer receiverWG.Done()
+			for el := range changedElements {
+				logger.Tracef(ctx, "<-changedElement: %s", el.ElementName)
+				changedCount++
+				w.changedImages = append(w.changedImages, el)
+			}
+		}()
+	})
 	wg.Wait()
 	close(changedElements)
+	receiverWG.Wait()
 
 	if changedCount > 0 {
 		w.imagesLayerObj.Refresh()

pkg/streampanel/image.go

@@ -103,7 +103,10 @@ func (p *Panel) downloadImageNoLock(
 func (p *Panel) getImage(
 	ctx context.Context,
 	imageID consts.ImageID,
-) (image.Image, bool, error) {
+) (_ret0 image.Image, _ret1 bool, _err error) {
+	logger.Tracef(ctx, "getImage(ctx, %v)", imageID)
+	defer func() { logger.Tracef(ctx, "/getImage(ctx, %v): %p %v %v", imageID, _ret0, _ret1, _err) }()
+
 	b, changed, err := p.downloadImage(ctx, imageID)
 	if err != nil {
 		return nil, false, fmt.Errorf("unable to download image '%s': %w", imageID, err)

pkg/streamplayer/stream_player.go

@@ -28,6 +28,10 @@ import (
 	"github.com/xaionaro-go/xsync"
 )
 
+const (
+	enableSeekOnStart = false
+)
+
 type Publisher interface {
 	ClosedChan() <-chan struct{}
 }
@@ -615,13 +619,15 @@ func (p *StreamPlayerHandler) controllerLoop(
 							logger.Errorf(ctx, "unable to unpause: %v", err)
 						}
 					}
-					if err := player.Seek(ctx, time.Second, true, true); err != nil {
-						logger.Errorf(ctx, "unable to seek: %v", err)
-					}
 					pos, err = player.GetPosition(ctx)
 					if err != nil {
 						err = fmt.Errorf("unable to get position: %w", err)
 					}
+					if enableSeekOnStart {
+						if err := player.Seek(ctx, -time.Second, true, true); err != nil {
+							logger.Errorf(ctx, "unable to seek: %v", err)
+						}
+					}
 				})
 				if err != nil {
 					logger.Tracef(ctx, "StreamPlayer[%s].controllerLoop: unable to get the current position: %v", p.StreamID, err)
@@ -708,8 +714,10 @@ func (p *StreamPlayerHandler) controllerLoop(
 		if err != nil {
 			logger.Errorf(ctx, "unable to setup the player for streaming: %v", err)
 		}
-		if err := player.Seek(ctx, time.Second, true, true); err != nil {
-			logger.Errorf(ctx, "unable to seek: %v", err)
+		if enableSeekOnStart {
+			if err := player.Seek(ctx, -time.Second, true, true); err != nil {
+				logger.Errorf(ctx, "unable to seek: %v", err)
+			}
 		}
 	})
 	if err != nil {