From c7f887a174bf0a95a858e6d31f113da7b6bfffd8 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 5 Apr 2020 19:04:21 +0200 Subject: begin of major change: switching from midi to OSC --- cmd/dolmetschctld/dolmetschctld.go | 2 +- cmd/dolmetschctld/statemachine.go | 4 ++-- cmd/dolmetschctld/telnet.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd/dolmetschctld') diff --git a/cmd/dolmetschctld/dolmetschctld.go b/cmd/dolmetschctld/dolmetschctld.go index 38f71ad..7105ae1 100644 --- a/cmd/dolmetschctld/dolmetschctld.go +++ b/cmd/dolmetschctld/dolmetschctld.go @@ -44,7 +44,7 @@ func main() { // ************************************* // * initialize core - m, err := mixer.NewMixer(mixer.Config{DevIn: "ESI MIDIMATE eX MIDI 2", DevOut: "ESI MIDIMATE eX MIDI 1"}) + m, err := mixer.NewMixer(mixer.Config{Host: "192.168.48.232"}) if err != nil { log.Printf("Error opening the mixer: %v", err) os.Exit(1) diff --git a/cmd/dolmetschctld/statemachine.go b/cmd/dolmetschctld/statemachine.go index 3e92f00..15f0e41 100644 --- a/cmd/dolmetschctld/statemachine.go +++ b/cmd/dolmetschctld/statemachine.go @@ -133,7 +133,7 @@ func (sm *StateMachine) publishState() { sm.stateSubscribers.Remove(entry) default: select { - case sub.publish <- types.FullState{sm.state, sm.original2InterpreterRatio, sm.language}: + case sub.publish <- types.FullState{State: sm.state, Ratio: sm.original2InterpreterRatio, Language: sm.language}: default: // subscriber is not responding... log.Printf("statemachine: removing subscriber '%v', because it is not responding", sub.publish) @@ -292,7 +292,7 @@ func (sm *StateMachine) run() { case req := <-sm.getOriginal2InterpreterRatioCh: req.resCh <- sm.original2InterpreterRatio case req := <-sm.getStateCh: - req.resCh <- getStateRes{types.FullState{sm.state, sm.original2InterpreterRatio, sm.language}} + req.resCh <- getStateRes{types.FullState{State: sm.state, Ratio: sm.original2InterpreterRatio, Language: sm.language}} case ev := <-sm.mixerEventCh: sm.handleMixerEvent(ev) sm.reconcile(false) diff --git a/cmd/dolmetschctld/telnet.go b/cmd/dolmetschctld/telnet.go index 5618ebe..55c3bf0 100644 --- a/cmd/dolmetschctld/telnet.go +++ b/cmd/dolmetschctld/telnet.go @@ -78,7 +78,7 @@ func telnetCmdState(c *telgo.Client, args []string, sm *StateMachine) bool { } state, ratio, lang := sm.GetState() c.Sayln("current state: %s", state) - c.Sayln("current ratio: %s", ratio) + c.Sayln("current ratio: %f", ratio) c.Sayln("current language: %s", lang) return false } -- cgit v1.2.3