diff options
| -rw-r--r-- | cmd/dolmetschctl/dolmetschctl.go | 7 | ||||
| -rw-r--r-- | pkg/controller/controller.go | 62 | ||||
| -rw-r--r-- | pkg/mixer/mixer.go | 8 |
3 files changed, 66 insertions, 11 deletions
diff --git a/cmd/dolmetschctl/dolmetschctl.go b/cmd/dolmetschctl/dolmetschctl.go index 6055896..a1598bc 100644 --- a/cmd/dolmetschctl/dolmetschctl.go +++ b/cmd/dolmetschctl/dolmetschctl.go @@ -25,7 +25,6 @@ package main import ( "log" "os" - "time" "spreadspace.org/dolmetschctl/pkg/controller" ) @@ -47,8 +46,12 @@ func main() { log.Printf("controller successfully initialized!") + ch := make(chan controller.Event, 100) + c.Subscribe(ch) for { - time.Sleep(1 * time.Second) + ev := <-ch + log.Printf("got controller event: %v", ev) } + log.Printf("exiting.") } diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index ab04fcc..01e36cd 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -23,9 +23,10 @@ package controller import ( + "container/list" "errors" "fmt" - "log" + // "log" "strings" "github.com/scgolang/midi" @@ -47,8 +48,32 @@ const ( LED_BLINK_MAX = byte(0x7f) ) +type EventType int + +const ( + ButtonPressed EventType = iota + ButtonReleased +) + +func (e EventType) String() string { + switch e { + case ButtonPressed: + return "button pressed" + case ButtonReleased: + return "button released" + default: + return "unknown" + } +} + +type Event struct { + Button byte + Type EventType +} + type Controller struct { - Dev *midi.Device + Dev *midi.Device + subscribers list.List } func openDevice(devices []*midi.Device, prefix string) (d *midi.Device, err error) { @@ -78,17 +103,39 @@ func NewController(c Config) (*Controller, error) { return ctrl, nil } +func (c *Controller) sendEvent(ev Event) { + var next *list.Element + for sub := c.subscribers.Front(); sub != nil; sub = next { + next = sub.Next() + + ch, ok := (sub.Value).(chan<- Event) + if !ok { + panic(fmt.Sprintf("controller: subscriber list element value has wrong type: %T", sub.Value)) + } + + select { + case ch <- ev: + default: + // subscriber is not respoding... + // log.Printf("controller: removing subscriber '%v', because it is not responding", ch) + close(ch) + c.subscribers.Remove(sub) + } + } +} + func (c *Controller) handleMidiPacket(p midi.Packet) { - num := p.Data[1] + ev := Event{Button: p.Data[1]} switch p.Data[0] { case BUTTON_ON: - log.Printf("controller: button %d pressed", num) + ev.Type = ButtonPressed case BUTTON_OFF: - log.Printf("controller: button %d released", num) + ev.Type = ButtonReleased default: // ignore all other events return } + c.sendEvent(ev) } func (c *Controller) Init() error { @@ -149,3 +196,8 @@ func (c *Controller) LedBlink(num, wait byte) error { } return c.setLed(num, wait+LED_BLINK_MIN) } + +func (c *Controller) Subscribe(out chan<- Event) { + // log.Printf("controller: subscribing '%v' to events", out) + c.subscribers.PushBack(out) +} diff --git a/pkg/mixer/mixer.go b/pkg/mixer/mixer.go index 6e8eb07..3cf869d 100644 --- a/pkg/mixer/mixer.go +++ b/pkg/mixer/mixer.go @@ -42,7 +42,7 @@ type Channel uint8 type EventType int const ( - EventFaderChange = iota + EventFaderChange EventType = iota EventMute ) @@ -87,9 +87,9 @@ func (fl FaderLevel) String() string { type Mute int8 const ( - MuteUnknown = -1 - MuteUnmuted = 0 - MuteMuted = 1 + MuteUnknown = Mute(-1) + MuteUnmuted = Mute(0) + MuteMuted = Mute(1) ) func (m Mute) String() string { |