This commit is contained in:
Alexandre Ratchov 2011-10-05 14:51:05 +02:00
parent 48c6dc6585
commit 6e0d4f312e
2 changed files with 6 additions and 6 deletions

View File

@ -785,7 +785,7 @@ ctl_trystart(struct aproc *p, int caller)
* allocate a new slot and register the given call-backs * allocate a new slot and register the given call-backs
*/ */
int int
ctl_slotnew(struct aproc *p, char *who, struct ctl_ops *ops, void *arg, int tr) ctl_slotnew(struct aproc *p, char *who, struct ctl_ops *ops, void *arg, int mmc)
{ {
int idx; int idx;
struct ctl_slot *s; struct ctl_slot *s;
@ -807,7 +807,7 @@ ctl_slotnew(struct aproc *p, char *who, struct ctl_ops *ops, void *arg, int tr)
s = p->u.ctl.slot + idx; s = p->u.ctl.slot + idx;
s->ops = ops; s->ops = ops;
s->arg = arg; s->arg = arg;
s->tstate = tr ? CTL_STOP : CTL_OFF; s->tstate = mmc ? CTL_STOP : CTL_OFF;
s->ops->vol(s->arg, s->vol); s->ops->vol(s->arg, s->vol);
ctl_msg_info(p, idx, msg); ctl_msg_info(p, idx, msg);
ctl_sendmsg(p, NULL, msg, SYSEX_SIZE(mixinfo)); ctl_sendmsg(p, NULL, msg, SYSEX_SIZE(mixinfo));

View File

@ -771,7 +771,7 @@ wav_autohdr(char *name, struct dev *dev, unsigned *hdr, unsigned *mode)
struct wav * struct wav *
wav_new_in(struct fileops *ops, struct dev *dev, wav_new_in(struct fileops *ops, struct dev *dev,
unsigned mode, char *name, unsigned hdr, unsigned mode, char *name, unsigned hdr,
struct aparams *par, unsigned xrun, unsigned volctl, int tr, int join) struct aparams *par, unsigned xrun, unsigned volctl, int mmc, int join)
{ {
int fd; int fd;
struct wav *f; struct wav *f;
@ -816,7 +816,7 @@ wav_new_in(struct fileops *ops, struct dev *dev,
f->map = NULL; f->map = NULL;
} }
f->dev = dev; f->dev = dev;
f->mmc = tr; f->mmc = mmc;
f->join = join; f->join = join;
f->mode = mode; f->mode = mode;
f->hpar = *par; f->hpar = *par;
@ -855,7 +855,7 @@ wav_new_in(struct fileops *ops, struct dev *dev,
struct wav * struct wav *
wav_new_out(struct fileops *ops, struct dev *dev, wav_new_out(struct fileops *ops, struct dev *dev,
unsigned mode, char *name, unsigned hdr, unsigned mode, char *name, unsigned hdr,
struct aparams *par, unsigned xrun, int tr, int join) struct aparams *par, unsigned xrun, int mmc, int join)
{ {
int fd; int fd;
struct wav *f; struct wav *f;
@ -895,7 +895,7 @@ wav_new_out(struct fileops *ops, struct dev *dev,
f->startpos = f->endpos = 0; f->startpos = f->endpos = 0;
} }
f->dev = dev; f->dev = dev;
f->mmc = tr; f->mmc = mmc;
f->join = join; f->join = join;
f->mode = mode; f->mode = mode;
f->hpar = *par; f->hpar = *par;