ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get a reference to the device when "snd/N" MIDI ports are opened 

As the master output level control is not in software any longer the
device needs to opened for adjustments to work.
This commit is contained in:
Alexandre Ratchov 2020-04-30 16:27:32 +02:00
parent d785baf4f3
commit 5736faa146
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sndiod/midi.c
View File

@ -190,6 +190,25 @@ midi_tag(struct midi *ep, unsigned int tag)
t->txmask |= ep->self;
}
/*
* return the list of tags
*/
unsigned int
midi_tags(struct midi *ep)
{
int i;
struct midithru *t;
unsigned int tags;
tags = 0;
for (i = 0; i < MIDITHRU_NMAX; i++) {
t = midithru + i;
if ((t->txmask | t->rxmask) & ep->self)
tags |= 1 << i;
}
return tags;
}
/*
* broadcast the given message to other endpoints
*/

1
sndiod/midi.h
View File

@ -110,6 +110,7 @@ void midi_out(struct midi *, unsigned char *, int);
void midi_send(struct midi *, unsigned char *, int);
void midi_fill(struct midi *);
void midi_tag(struct midi *, unsigned int);
unsigned int midi_tags(struct midi *);
void midi_link(struct midi *, struct midi *);
void port_log(struct port *);

9
sndiod/sock.c
View File

@ -130,7 +130,9 @@ sock_log(struct sock *f)
void
sock_close(struct sock *f)
{
struct dev *d;
struct sock **pf;
unsigned int tags, i;
for (pf = &sock_list; *pf != f; pf = &(*pf)->next) {
#ifdef DEBUG
@ -155,6 +157,11 @@ sock_close(struct sock *f)
f->slot = NULL;
}
if (f->midi) {
tags = midi_tags(f->midi);
for (i = 0; i < DEV_NMAX; i++) {
if ((tags & (1 << i)) && (d = dev_bynum(i)) != NULL)
dev_unref(d);
}
midi_del(f->midi);
f->midi = NULL;
}
@ -861,6 +868,8 @@ sock_hello(struct sock *f)
d = dev_bynum(p->devnum);
if (d == NULL)
return 0;
if (!dev_ref(d))
return 0;
midi_tag(f->midi, p->devnum);
} else if (p->devnum < 32) {
midi_tag(f->midi, p->devnum);