mirror of
https://github.com/onyx-and-iris/voicemeeter.git
synced 2024-11-15 17:40:51 +00:00
event Add() and Remove() now variadic.
in strip, vban, log warning then return zero value instead of panic. update readme
This commit is contained in:
parent
76ed3320d3
commit
be6a49e3bc
12
README.md
12
README.md
@ -147,19 +147,19 @@ sets many parameters in script format eg. ("Strip[0].Mute=1;Bus[3].Gain=3.6")
|
|||||||
|
|
||||||
#### `vm.Register(o observer)`
|
#### `vm.Register(o observer)`
|
||||||
|
|
||||||
register an object as an observer
|
register an observer type as an observer
|
||||||
|
|
||||||
#### `vm.Deregister(o observer)`
|
#### `vm.Deregister(o observer)`
|
||||||
|
|
||||||
deregister an object as an observer
|
deregister an observer type as an observer
|
||||||
|
|
||||||
#### `vm.EventAdd(<event>)`
|
#### `vm.EventAdd(<events>)`
|
||||||
|
|
||||||
adds an event to the pooler eg. vm.EventAdd("ldirty")
|
adds a single or multiple events to the pooler. Accepts a string or slice of strings.
|
||||||
|
|
||||||
#### `vm.EventRemove(<event>)`
|
#### `vm.EventRemove(<events>)`
|
||||||
|
|
||||||
removes an event to the pooler eg. vm.EventRemove("pdirty")
|
removes a single or multiple events from the pooler. Accepts a string or slice of strings.
|
||||||
|
|
||||||
#### `vm.Pdirty()`
|
#### `vm.Pdirty()`
|
||||||
|
|
||||||
|
16
publisher.go
16
publisher.go
@ -2,6 +2,8 @@ package voicemeeter
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// observer defines the interface any registered observers must satisfy
|
// observer defines the interface any registered observers must satisfy
|
||||||
@ -51,8 +53,9 @@ func newEvent() *event {
|
|||||||
return &event{true, true, true, false}
|
return &event{true, true, true, false}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *event) Add(ev string) {
|
func (e *event) Add(events ...string) {
|
||||||
switch ev {
|
for _, event := range events {
|
||||||
|
switch event {
|
||||||
case "pdirty":
|
case "pdirty":
|
||||||
e.pdirty = true
|
e.pdirty = true
|
||||||
case "mdirty":
|
case "mdirty":
|
||||||
@ -62,10 +65,13 @@ func (e *event) Add(ev string) {
|
|||||||
case "ldirty":
|
case "ldirty":
|
||||||
e.ldirty = true
|
e.ldirty = true
|
||||||
}
|
}
|
||||||
|
log.Info(event, " added to the pooler")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *event) Remove(ev string) {
|
func (e *event) Remove(events ...string) {
|
||||||
switch ev {
|
for _, event := range events {
|
||||||
|
switch event {
|
||||||
case "pdirty":
|
case "pdirty":
|
||||||
e.pdirty = false
|
e.pdirty = false
|
||||||
case "mdirty":
|
case "mdirty":
|
||||||
@ -75,6 +81,8 @@ func (e *event) Remove(ev string) {
|
|||||||
case "ldirty":
|
case "ldirty":
|
||||||
e.ldirty = false
|
e.ldirty = false
|
||||||
}
|
}
|
||||||
|
log.Info(event, " removed from the pooler")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// pooler continuously polls the dirty paramters
|
// pooler continuously polls the dirty paramters
|
||||||
|
24
remote.go
24
remote.go
@ -8,7 +8,7 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// A Remote type represents the API for a kind
|
// Remote represents the API for a kind
|
||||||
type Remote struct {
|
type Remote struct {
|
||||||
Kind *kind
|
Kind *kind
|
||||||
Strip []iStrip
|
Strip []iStrip
|
||||||
@ -85,7 +85,7 @@ func (r *Remote) Sync() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Gets a float parameter value
|
// GetFloat gets a float parameter value
|
||||||
func (r *Remote) GetFloat(name string) (float64, error) {
|
func (r *Remote) GetFloat(name string) (float64, error) {
|
||||||
val, err := getParameterFloat(name)
|
val, err := getParameterFloat(name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -94,7 +94,7 @@ func (r *Remote) GetFloat(name string) (float64, error) {
|
|||||||
return val, nil
|
return val, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets a float paramter value
|
// SetFloat sets a float paramter value
|
||||||
func (r *Remote) SetFloat(name string, value float64) error {
|
func (r *Remote) SetFloat(name string, value float64) error {
|
||||||
err := setParameterFloat(name, value)
|
err := setParameterFloat(name, value)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -103,7 +103,7 @@ func (r *Remote) SetFloat(name string, value float64) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Gets a string parameter value
|
// GetString gets a string parameter value
|
||||||
func (r *Remote) GetString(name string) (string, error) {
|
func (r *Remote) GetString(name string) (string, error) {
|
||||||
val, err := getParameterString(name)
|
val, err := getParameterString(name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -112,7 +112,7 @@ func (r *Remote) GetString(name string) (string, error) {
|
|||||||
return val, nil
|
return val, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets a string paramter value
|
// SetString sets a string parameter value
|
||||||
func (r *Remote) SetString(name, value string) error {
|
func (r *Remote) SetString(name, value string) error {
|
||||||
err := setParameterString(name, value)
|
err := setParameterString(name, value)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -140,14 +140,14 @@ func (r *Remote) Deregister(o observer) {
|
|||||||
r.pooler.Deregister(o)
|
r.pooler.Deregister(o)
|
||||||
}
|
}
|
||||||
|
|
||||||
// EventAdd adds an event to the Pooler
|
// EventAdd adds events to the Pooler
|
||||||
func (r *Remote) EventAdd(event string) {
|
func (r *Remote) EventAdd(events ...string) {
|
||||||
r.pooler.event.Add(event)
|
r.pooler.event.Add(events...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// EventRemove removes an event from the Pooler
|
// EventRemove removes events from the Pooler
|
||||||
func (r *Remote) EventRemove(event string) {
|
func (r *Remote) EventRemove(events ...string) {
|
||||||
r.pooler.event.Remove(event)
|
r.pooler.event.Remove(events...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// remoteBuilder defines the interface builder types must satisfy
|
// remoteBuilder defines the interface builder types must satisfy
|
||||||
@ -165,7 +165,7 @@ type remoteBuilder interface {
|
|||||||
Get() *Remote
|
Get() *Remote
|
||||||
}
|
}
|
||||||
|
|
||||||
// directory is responsible for directing the genericBuilder
|
// director is responsible for directing the genericBuilder
|
||||||
type director struct {
|
type director struct {
|
||||||
builder remoteBuilder
|
builder remoteBuilder
|
||||||
}
|
}
|
||||||
|
44
strip.go
44
strip.go
@ -3,9 +3,11 @@ package voicemeeter
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// iStrip defines the interface bus types must satisfy
|
// iStrip defines the interface strip types must satisfy
|
||||||
type iStrip interface {
|
type iStrip interface {
|
||||||
String() string
|
String() string
|
||||||
GetMute() bool
|
GetMute() bool
|
||||||
@ -179,14 +181,16 @@ func (p *physicalStrip) SetAudibility(val float64) {
|
|||||||
p.setter_float("Audibility", val)
|
p.setter_float("Audibility", val)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMc panics reason invalid parameter
|
// GetMc logs a warning reason invalid parameter
|
||||||
|
// it always returns zero value
|
||||||
func (p *physicalStrip) GetMc() bool {
|
func (p *physicalStrip) GetMc() bool {
|
||||||
panic("invalid parameter MC for physicalStrip")
|
log.Warn("invalid parameter MC for physicalStrip")
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetMc panics reason invalid parameter
|
// SetMc logs a warning reason invalid parameter
|
||||||
func (p *physicalStrip) SetMc(val bool) {
|
func (p *physicalStrip) SetMc(val bool) {
|
||||||
panic("invalid parameter MC for physicalStrip")
|
log.Warn("invalid parameter MC for physicalStrip")
|
||||||
}
|
}
|
||||||
|
|
||||||
// virtualStrip represents a single virtual strip
|
// virtualStrip represents a single virtual strip
|
||||||
@ -221,34 +225,40 @@ func (v *virtualStrip) SetMc(val bool) {
|
|||||||
v.setter_bool("MC", val)
|
v.setter_bool("MC", val)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetComp panics reason invalid parameter
|
// GetComp logs a warning reason invalid parameter
|
||||||
|
// it always returns zero value
|
||||||
func (v *virtualStrip) GetComp() float64 {
|
func (v *virtualStrip) GetComp() float64 {
|
||||||
panic("invalid parameter Comp for virtualStrip")
|
log.Warn("invalid parameter Comp for virtualStrip")
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetComp panics reason invalid parameter
|
// SetComp logs a warning reason invalid parameter
|
||||||
func (v *virtualStrip) SetComp(val float64) {
|
func (v *virtualStrip) SetComp(val float64) {
|
||||||
panic("invalid parameter Comp for virtualStrip")
|
log.Warn("invalid parameter Comp for virtualStrip")
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGate panics reason invalid parameter
|
// GetGate logs a warning reason invalid parameter
|
||||||
|
// it always returns zero value
|
||||||
func (v *virtualStrip) GetGate() float64 {
|
func (v *virtualStrip) GetGate() float64 {
|
||||||
panic("invalid parameter Gate for virtualStrip")
|
log.Warn("invalid parameter Gate for virtualStrip")
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetGate panics reason invalid parameter
|
// SetGate logs a warning reason invalid parameter
|
||||||
func (v *virtualStrip) SetGate(val float64) {
|
func (v *virtualStrip) SetGate(val float64) {
|
||||||
panic("invalid parameter Gate for virtualStrip")
|
log.Warn("invalid parameter Gate for virtualStrip")
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAudibility panics reason invalid parameter
|
// GetAudibility logs a warning reason invalid parameter
|
||||||
|
// it always returns zero value
|
||||||
func (v *virtualStrip) GetAudibility() float64 {
|
func (v *virtualStrip) GetAudibility() float64 {
|
||||||
panic("invalid parameter Audibility for virtualStrip")
|
log.Warn("invalid parameter Audibility for virtualStrip")
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetAudibility panics reason invalid parameter
|
// SetAudibility logs a warning reason invalid parameter
|
||||||
func (v *virtualStrip) SetAudibility(val float64) {
|
func (v *virtualStrip) SetAudibility(val float64) {
|
||||||
panic("invalid parameter Audibility for virtualStrip")
|
log.Warn("invalid parameter Audibility for virtualStrip")
|
||||||
}
|
}
|
||||||
|
|
||||||
// AppGain sets the gain in db by val for the app matching name.
|
// AppGain sets the gain in db by val for the app matching name.
|
||||||
|
21
vban.go
21
vban.go
@ -1,6 +1,10 @@
|
|||||||
package voicemeeter
|
package voicemeeter
|
||||||
|
|
||||||
import "fmt"
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
// iVban defines the interface vban types must satisfy
|
// iVban defines the interface vban types must satisfy
|
||||||
type iVban interface {
|
type iVban interface {
|
||||||
@ -105,7 +109,8 @@ func (v *vbanStream) SetBit(val int) {
|
|||||||
case 24:
|
case 24:
|
||||||
val = 2
|
val = 2
|
||||||
default:
|
default:
|
||||||
panic("expected value 16 or 24")
|
log.Warn("expected value 16 or 24")
|
||||||
|
return
|
||||||
}
|
}
|
||||||
v.setter_int("Bit", val)
|
v.setter_int("Bit", val)
|
||||||
}
|
}
|
||||||
@ -139,19 +144,19 @@ func newVbanInStream(i int) iVban {
|
|||||||
return iVban(&vbi)
|
return iVban(&vbi)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetSr panics reason read only
|
// SetSr logs a warning reason read only
|
||||||
func (vbi *vbanInStream) SetSr(val int) {
|
func (vbi *vbanInStream) SetSr(val int) {
|
||||||
panic("SR is readonly for vban instreams")
|
log.Warn("SR is readonly for vban instreams")
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetChannel panics reason read only
|
// SetChannel logs a warning reason read only
|
||||||
func (vbi *vbanInStream) SetChannel(val int) {
|
func (vbi *vbanInStream) SetChannel(val int) {
|
||||||
panic("channel is readonly for vban instreams")
|
log.Warn("channel is readonly for vban instreams")
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetBit panics reason read only
|
// SetBit logs a warning reason read only
|
||||||
func (vbi *vbanInStream) SetBit(val int) {
|
func (vbi *vbanInStream) SetBit(val int) {
|
||||||
panic("bit is readonly for vban instreams")
|
log.Warn("bit is readonly for vban instreams")
|
||||||
}
|
}
|
||||||
|
|
||||||
type vbanOutStream struct {
|
type vbanOutStream struct {
|
||||||
|
Loading…
Reference in New Issue
Block a user