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

Merge branch 'master' into mixer

This commit is contained in:
Alexandre Ratchov 2017-11-04 10:41:04 +01:00
parent 752ac51f33 c0767fd171
commit 81d171003b
5 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsndio/aucat.c
View File

@ -335,10 +335,8 @@ bad_gen:
unlink(tmp);
}
done:
if (tmp)
free(tmp);
if (path)
free(path);
free(tmp);
free(path);
return 1;
}

5
libsndio/mio_open.3
View File

@ -247,3 +247,8 @@ may be a value between 0 and 2.
.Xr midi 4 ,
.Xr sndio 7 ,
.Xr sndiod 8
.Sh HISTORY
These functions first appeared in
.Ox 4.7 .
.Sh AUTHORS
.An Alexandre Ratchov Aq Mt ratchov@openbsd.org

10
libsndio/mio_rmidi.c
View File

@ -66,7 +66,7 @@ static struct mio_ops mio_rmidi_ops = {
mio_rmidi_revents
};
static int
int
mio_rmidi_getfd(const char *str, unsigned int mode, int nbio)
{
const char *p;
@ -77,6 +77,9 @@ mio_rmidi_getfd(const char *str, unsigned int mode, int nbio)
#endif
int fd, flags;
#ifdef DEBUG
_sndio_debug_init();
#endif
p = _sndio_parsetype(str, "rmidi");
if (p == NULL) {
DPRINTF("mio_rmidi_getfd: %s: \"rsnd\" expected\n", str);
@ -135,11 +138,14 @@ mio_rmidi_getfd(const char *str, unsigned int mode, int nbio)
return fd;
}
static struct mio_hdl *
struct mio_hdl *
mio_rmidi_fdopen(int fd, unsigned int mode, int nbio)
{
struct mio_rmidi_hdl *hdl;
#ifdef DEBUG
_sndio_debug_init();
#endif
hdl = malloc(sizeof(struct mio_rmidi_hdl));
if (hdl == NULL)
return NULL;

10
libsndio/sio_sun.c
View File

@ -267,7 +267,7 @@ sio_sun_getcap(struct sio_hdl *sh, struct sio_cap *cap)
return 1;
}
static int
int
sio_sun_getfd(const char *str, unsigned int mode, int nbio)
{
const char *p;
@ -275,6 +275,9 @@ sio_sun_getfd(const char *str, unsigned int mode, int nbio)
unsigned int devnum;
int fd, flags;
#ifdef DEBUG
_sndio_debug_init();
#endif
p = _sndio_parsetype(str, "rsnd");
if (p == NULL) {
DPRINTF("sio_sun_getfd: %s: \"rsnd\" expected\n", str);
@ -307,11 +310,14 @@ sio_sun_getfd(const char *str, unsigned int mode, int nbio)
return fd;
}
static struct sio_hdl *
struct sio_hdl *
sio_sun_fdopen(int fd, unsigned int mode, int nbio)
{
struct sio_sun_hdl *hdl;
#ifdef DEBUG
_sndio_debug_init();
#endif
hdl = malloc(sizeof(struct sio_sun_hdl));
if (hdl == NULL)
return NULL;

5
libsndio/sndio.h
View File

@ -191,6 +191,11 @@ int siomix_pollfd(struct siomix_hdl *, struct pollfd *, int);
int siomix_revents(struct siomix_hdl *, struct pollfd *);
int siomix_eof(struct siomix_hdl *);
int mio_rmidi_getfd(const char *, unsigned int, int);
struct mio_hdl *mio_rmidi_fdopen(int, unsigned int, int);
int sio_sun_getfd(const char *, unsigned int, int);
struct sio_hdl *sio_sun_fdopen(int, unsigned int, int);
#ifdef __cplusplus
}
#endif