tests/examples updated with v2 changes

getCmd in vm-cli always prints value.

examples/hotkeys/main.go

@@ -6,7 +6,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/eiannone/keyboard"
-	"github.com/onyx-and-iris/voicemeeter"
+	"github.com/onyx-and-iris/voicemeeter/v2"
 )
 
 func init() {
@@ -39,9 +39,9 @@ Loop:
 		case '0':
 			fmt.Printf("Logged into Voicemeeter %s, version %s\n", vm.Type(), vm.Version())
 		case '1':
-			vm.Strip[0].SetMute(!vm.Strip[0].GetMute())
+			vm.Strip[0].SetMute(!vm.Strip[0].Mute())
 		case '2':
-			if vm.Strip[3].GetGain() == -12.8 {
+			if vm.Strip[3].Gain() == -12.8 {
 				vm.Strip[3].FadeBy(-8.3, 500)
 			} else {
 				vm.Strip[3].FadeTo(-12.8, 500)

examples/obs/main.go

@@ -7,7 +7,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/onyx-and-iris/voicemeeter"
+	"github.com/onyx-and-iris/voicemeeter/v2"
 
 	"github.com/andreykaipov/goobs"
 	"github.com/andreykaipov/goobs/api/events"

examples/observer/main.go

@@ -2,49 +2,42 @@ package main
 
 import (
 	"fmt"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/onyx-and-iris/voicemeeter"
+	"github.com/onyx-and-iris/voicemeeter/v2"
 )
 
 // observer represents a single receiver of updates
 type observer struct {
-	vm *voicemeeter.Remote
+	vm     *voicemeeter.Remote
+	events chan string
 }
 
 // newObserver add ldirty events to the eventlist and returns an observer type
 func newObserver(vm *voicemeeter.Remote) *observer {
-	vm.EventAdd("ldirty")
-	return &observer{vm}
-}
-
-// register registers this observer to receive updates
-func (o observer) register() {
-	o.vm.Register(o)
-}
-
-// deregister deregisters this observer to receive updates
-func (o observer) deregister() {
-	o.vm.Deregister(o)
+	o := &observer{vm, make(chan string)}
+	return o
 }
 
 // OnUpdate satisfies the observer interface defined in publisher.go
 // for each event type an action is triggered when the event occurs.
-func (o observer) OnUpdate(subject string) {
-	if subject == "pdirty" {
-		fmt.Println("pdirty!")
-	} else if subject == "mdirty" {
-		fmt.Println("mdirty!")
-	} else if subject == "midi" {
-		var current = o.vm.Midi.Current()
-		var val = o.vm.Midi.Get(current)
-		fmt.Printf("Value of midi button %d: %d\n", current, val)
-	} else if subject == "ldirty" {
-		for _, bus := range o.vm.Bus {
-			if bus.Levels().IsDirty() {
-				fmt.Println(bus, bus.Levels().All())
+func (o observer) Listen() {
+	o.vm.Register(o.events)
+
+	for s := range o.events {
+		switch s {
+		case "pdirty", "mdirty":
+			fmt.Println(s)
+		case "midi":
+			var current = o.vm.Midi.Current()
+			var val = o.vm.Midi.Get(current)
+			fmt.Printf("Value of midi button %d: %d\n", current, val)
+		case "ldirty":
+			for _, bus := range o.vm.Bus {
+				if bus.Levels().IsDirty() {
+					fmt.Println(bus, bus.Levels().All())
+				}
 			}
 		}
 	}
@@ -54,6 +47,11 @@ func init() {
 	log.SetLevel(log.InfoLevel)
 }
 
+func runObserver(vm *voicemeeter.Remote) {
+	o := newObserver(vm)
+	o.Listen()
+}
+
 // main connects to Voiceemeter, registers observer for updates
 // runs updates for 30 seconds and then deregisters observer.
 func main() {
@@ -63,15 +61,12 @@ func main() {
 	}
 	defer vm.Logout()
 
-	o := newObserver(vm)
-	o.register()
-	time.Sleep(30 * time.Second)
-	o.deregister()
+	runObserver(vm)
 }
 
 // vmConnect connects to Voicemeeter potato and logs into the API
 func vmConnect() (*voicemeeter.Remote, error) {
-	vm, err := voicemeeter.NewRemote("potato", 0)
+	vm, err := voicemeeter.NewRemote("basic", 0)
 	if err != nil {
 		return nil, err
 	}
@@ -80,6 +75,7 @@ func vmConnect() (*voicemeeter.Remote, error) {
 	if err != nil {
 		return nil, err
 	}
+	vm.EventAdd("ldirty")
 
 	return vm, nil
 }

examples/vm-cli/main.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/onyx-and-iris/voicemeeter"
+	"github.com/onyx-and-iris/voicemeeter/v2"
 )
 
 type (
@@ -168,9 +168,9 @@ func getCmd(vm *voicemeeter.Remote, cmd string) error {
 			err = fmt.Errorf("unable to get %s", cmd)
 			return err
 		}
-		vPrinter.printf("Value of %s is: %s", cmd, valS)
+		fmt.Printf("Value of %s is: %s", cmd, valS)
 	} else {
-		vPrinter.printf("Value of %s is: %v", cmd, valF)
+		fmt.Printf("Value of %s is: %v", cmd, valF)
 	}
 	return nil
 }