summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/ttymididrv/driver.go20
-rw-r--r--pkg/ttymididrv/out.go8
2 files changed, 16 insertions, 12 deletions
diff --git a/pkg/ttymididrv/driver.go b/pkg/ttymididrv/driver.go
index cc7b1fd..f2282df 100644
--- a/pkg/ttymididrv/driver.go
+++ b/pkg/ttymididrv/driver.go
@@ -3,19 +3,19 @@ package ttymididrv
import (
"sync"
- "gitlab.com/gomidi/midi/mid"
+ "gitlab.com/gomidi/midi"
)
type driver struct {
mu sync.RWMutex
- outs []mid.Out
- opened []mid.Port
+ outs []midi.Out
+ opened []midi.Port
closed bool
}
-func New(name string, baud int) mid.Driver {
+func New(name string, baud int) midi.Driver {
d := &driver{}
- d.outs = []mid.Out{
+ d.outs = []midi.Out{
&out{
name: name,
baud: baud,
@@ -35,7 +35,7 @@ func (d *driver) Close() (err error) {
d.mu.RLock()
if d.closed {
d.mu.RUnlock()
- return mid.ErrClosed
+ return midi.ErrPortClosed
}
d.mu.RUnlock()
@@ -50,23 +50,23 @@ func (d *driver) Close() (err error) {
return
}
-func (d *driver) Ins() ([]mid.In, error) {
+func (d *driver) Ins() ([]midi.In, error) {
d.mu.Lock()
defer d.mu.Unlock()
if d.closed {
- return nil, mid.ErrClosed
+ return nil, midi.ErrPortClosed
}
return nil, nil
}
-func (d *driver) Outs() ([]mid.Out, error) {
+func (d *driver) Outs() ([]midi.Out, error) {
d.mu.Lock()
defer d.mu.Unlock()
if d.closed {
- return nil, mid.ErrClosed
+ return nil, midi.ErrPortClosed
}
return d.outs, nil
diff --git a/pkg/ttymididrv/out.go b/pkg/ttymididrv/out.go
index 3e16cff..4932190 100644
--- a/pkg/ttymididrv/out.go
+++ b/pkg/ttymididrv/out.go
@@ -1,6 +1,7 @@
package ttymididrv
import (
+ "fmt"
"sync"
"github.com/tarm/serial"
@@ -73,7 +74,10 @@ func (o *out) Underlying() interface{} {
return o.port
}
-func (o *out) Send(b []byte) error {
+func (o *out) Write(b []byte) (int, error) {
_, err := o.port.Write(b)
- return err
+ if err != nil {
+ return 0, fmt.Errorf("could not write to port: %w", err)
+ }
+ return len(b), nil
}