Merge pull request #3 from unix-streamdeck/feat/optimizations

Feat/optimizations

Author: The-Jonsey

go.mod

@@ -10,4 +10,5 @@ require (
 	github.com/unix-streamdeck/api v0.0.0-20200818180846-6942d99617b2
 	github.com/unix-streamdeck/driver v0.0.0-20200817173808-cdaf123c076b
 	golang.org/x/image v0.0.0-20200119044424-58c23975cae1
+	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
 )

go.sum

@@ -115,6 +115,7 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

handlers/gif.go

@@ -1,9 +1,10 @@
 package handlers
 
 import (
+	"github.com/nfnt/resize"
 	"github.com/unix-streamdeck/api"
 	"github.com/unix-streamdeck/driver"
-	"github.com/nfnt/resize"
+	"image"
 	"image/gif"
 	"log"
 	"os"
@@ -18,24 +19,32 @@ func (s *GifIconHandler) Icon(page int, index int, key *api.Key, dev streamdeck.
 		return
 	}
 	gifs, err := gif.DecodeAll(f)
+	if err != nil {
+		log.Println(err)
+		return
+	}
 	timeDelay := gifs.Delay[0]
-	gifIndex := 0
-	go loop(gifs, gifIndex, timeDelay, page, index, dev, key, s)
+	frames := make([]image.Image, len(gifs.Image))
+	for i, frame := range gifs.Image {
+		frames[i] = resize.Resize(dev.Pixels, dev.Pixels, frame, resize.Lanczos3)
+	}
+	go loop(frames, timeDelay, page, index, dev, key, s)
 }
 
 func (s *GifIconHandler) Stop() {
 	s.Running = false
 }
 
-func loop(gifs *gif.GIF, gifIndex int, timeDelay int, page int, index int, dev streamdeck.Device, key *api.Key, s *GifIconHandler) {
+func loop(frames []image.Image, timeDelay int, page int, index int, dev streamdeck.Device, key *api.Key, s *GifIconHandler) {
+	gifIndex := 0
 	for s.Running {
-		img := resize.Resize(dev.Pixels, dev.Pixels, gifs.Image[gifIndex], resize.Lanczos3)
+		img := frames[gifIndex]
 		s.OnSetImage(img, index, page, dev)
 		key.Buff = img
 		gifIndex++
-		if gifIndex >= len(gifs.Image) {
+		if gifIndex >= len(frames) {
 			gifIndex = 0
 		}
 		time.Sleep(time.Duration(timeDelay * 10000000))
 	}
-}
+}

interface.go

@@ -1,12 +1,14 @@
 package main
 
 import (
+	"context"
 	"github.com/fogleman/gg"
 	"github.com/nfnt/resize"
 	"github.com/unix-streamdeck/api"
 	"github.com/unix-streamdeck/driver"
-	"golang.org/x/image/font/inconsolata"
 	"github.com/unix-streamdeck/streamdeckd/handlers"
+	"golang.org/x/image/font/inconsolata"
+	"golang.org/x/sync/semaphore"
 	"image"
 	"image/color"
 	"image/draw"
@@ -15,6 +17,7 @@ import (
 )
 
 var p int
+var sem = semaphore.NewWeighted(int64(1))
 
 func LoadImage(path string) (image.Image, error) {
 	f, err := os.Open(path)
@@ -36,12 +39,19 @@ func ResizeImage(img image.Image) image.Image {
 }
 
 func SetImage(img image.Image, i int, page int, dev streamdeck.Device) {
+	ctx := context.Background()
+	err := sem.Acquire(ctx, 1)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	defer sem.Release(1)
 	if p == page {
 		dev.SetImage(uint8(i), img)
 	}
 }
 
-func SetKey(currentKey *api.Key, i int) {
+func SetKeyImage(currentKey *api.Key, i int) {
 	if currentKey.Buff == nil {
 		if currentKey.Icon == "" {
 			img := image.NewRGBA(image.Rect(0, 0, int(dev.Pixels), int(dev.Pixels)))
@@ -74,30 +84,34 @@ func SetPage(config *api.Config, page int, dev streamdeck.Device) {
 	currentPage := config.Pages[page]
 	for i := 0; i < len(currentPage); i++ {
 		currentKey := &currentPage[i]
-		if currentKey.Buff == nil {
-			if currentKey.IconHandler == "" {
-				SetKey(currentKey, i)
+		go SetKey(currentKey, i, page, dev)
+	}
+	EmitPage(p)
+}
 
-			} else if currentKey.IconHandlerStruct == nil {
-				var handler api.IconHandler
-				if currentKey.IconHandler == "Gif" {
-					handler = &handlers.GifIconHandler{Running:true, OnSetImage: SetImage}
-				} else if currentKey.IconHandler == "Counter" {
-					handler = &handlers.CounterIconHandler{Count:0, Running: true, OnSetImage: SetImage}
-				} else if currentKey.IconHandler == "Time" {
-					handler = &handlers.TimeIconHandler{Running:true, OnSetImage: SetImage}
-				}
-				if handler == nil {
-					continue
-				}
-				handler.Icon(page, i, currentKey, dev)
-				currentKey.IconHandlerStruct = handler
+func SetKey(currentKey *api.Key, i int, page int, dev streamdeck.Device) {
+	if currentKey.Buff == nil {
+		if currentKey.IconHandler == "" {
+			SetKeyImage(currentKey, i)
+
+		} else if currentKey.IconHandlerStruct == nil {
+			var handler api.IconHandler
+			if currentKey.IconHandler == "Gif" {
+				handler = &handlers.GifIconHandler{Running:true, OnSetImage: SetImage}
+			} else if currentKey.IconHandler == "Counter" {
+				handler = &handlers.CounterIconHandler{Count:0, Running: true, OnSetImage: SetImage}
+			} else if currentKey.IconHandler == "Time" {
+				handler = &handlers.TimeIconHandler{Running:true, OnSetImage: SetImage}
 			}
-		} else {
-			SetImage(currentKey.Buff, i, p, dev)
+			if handler == nil {
+				return
+			}
+			handler.Icon(page, i, currentKey, dev)
+			currentKey.IconHandlerStruct = handler
 		}
+	} else {
+		SetImage(currentKey.Buff, i, p, dev)
 	}
-	EmitPage(p)
 }
 
 func HandleInput(key *api.Key, page int, index int, dev streamdeck.Device) {
@@ -112,7 +126,10 @@ func HandleInput(key *api.Key, page int, index int, dev streamdeck.Device) {
 		SetPage(config, page, dev)
 	}
 	if key.Brightness != 0 {
-		_ = dev.SetBrightness(uint8(key.Brightness))
+		err := dev.SetBrightness(uint8(key.Brightness))
+		if err != nil {
+			log.Println(err)
+		}
 	}
 	if key.Url != "" {
 		runCommand("xdg-open " + key.Url)

main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/unix-streamdeck/driver"
 	"github.com/unix-streamdeck/api"
+	"github.com/unix-streamdeck/driver"
 	_ "image/gif"
 	_ "image/jpeg"
 	_ "image/png"