Moved payloads out of their own package because it made the API less nice.

This commit is contained in:
Sam Rose
2019-07-14 21:52:11 +01:00
parent 8ee19c457a
commit b94be0cf1e
5 changed files with 39 additions and 45 deletions

View File

@ -11,7 +11,6 @@ import (
"strconv"
"github.com/samwho/streamdeck"
"github.com/samwho/streamdeck/payload"
)
const (
@ -53,7 +52,7 @@ func setupCounter(client *streamdeck.Client) {
settings := make(map[string]*Settings)
action.RegisterHandler(streamdeck.WillAppear, func(ctx context.Context, client *streamdeck.Client, event streamdeck.Event) error {
p := payload.WillAppear{}
p := streamdeck.WillAppearPayload{}
if err := json.Unmarshal(event.Payload, &p); err != nil {
return err
}
@ -73,11 +72,11 @@ func setupCounter(client *streamdeck.Client) {
return err
}
if err := client.SetImage(ctx, bg, payload.HardwareAndSoftware); err != nil {
if err := client.SetImage(ctx, bg, streamdeck.HardwareAndSoftware); err != nil {
return err
}
return client.SetTitle(ctx, strconv.Itoa(s.Counter), payload.HardwareAndSoftware)
return client.SetTitle(ctx, strconv.Itoa(s.Counter), streamdeck.HardwareAndSoftware)
})
action.RegisterHandler(streamdeck.WillDisappear, func(ctx context.Context, client *streamdeck.Client, event streamdeck.Event) error {
@ -97,7 +96,7 @@ func setupCounter(client *streamdeck.Client) {
return err
}
return client.SetTitle(ctx, strconv.Itoa(s.Counter), payload.HardwareAndSoftware)
return client.SetTitle(ctx, strconv.Itoa(s.Counter), streamdeck.HardwareAndSoftware)
})
}

View File

@ -9,8 +9,6 @@ import (
"os"
"time"
"github.com/samwho/streamdeck/payload"
"github.com/samwho/streamdeck"
sdcontext "github.com/samwho/streamdeck/context"
"github.com/shirou/gopsutil/cpu"
@ -88,12 +86,12 @@ func setup(client *streamdeck.Client) {
continue
}
if err := client.SetImage(ctx, img, payload.HardwareAndSoftware); err != nil {
if err := client.SetImage(ctx, img, streamdeck.HardwareAndSoftware); err != nil {
log.Printf("error setting image: %v\n", err)
continue
}
if err := client.SetTitle(ctx, fmt.Sprintf("CPU\n%d%%", int(r[0])), payload.HardwareAndSoftware); err != nil {
if err := client.SetTitle(ctx, fmt.Sprintf("CPU\n%d%%", int(r[0])), streamdeck.HardwareAndSoftware); err != nil {
log.Printf("error setting title: %v\n", err)
continue
}