Merge branch 'master' into mixer

This commit is contained in:
Alexandre Ratchov 2019-07-28 11:27:10 +02:00
commit 4f5ac3cdb6
4 changed files with 6 additions and 2 deletions

View File

@ -20,7 +20,7 @@
/* /*
* limits * limits
*/ */
#define NCHAN_MAX 16 /* max channel in a stream */ #define NCHAN_MAX 64 /* max channel in a stream */
#define RATE_MIN 4000 /* min sample rate */ #define RATE_MIN 4000 /* min sample rate */
#define RATE_MAX 192000 /* max sample rate */ #define RATE_MAX 192000 /* max sample rate */
#define BITS_MIN 1 /* min bits per sample */ #define BITS_MIN 1 /* min bits per sample */

View File

@ -489,8 +489,10 @@ sio_alsa_xrun(struct sio_alsa_hdl *hdl)
int wbpf; int wbpf;
DPRINTFN(2, "sio_alsa_xrun:\n"); DPRINTFN(2, "sio_alsa_xrun:\n");
#ifdef DEBUG
if (_sndio_debug >= 2) if (_sndio_debug >= 2)
_sio_printpos(&hdl->sio); _sio_printpos(&hdl->sio);
#endif
/* /*
* we assume rused/wused are zero if rec/play modes are not * we assume rused/wused are zero if rec/play modes are not

View File

@ -665,8 +665,10 @@ sio_oss_xrun(struct sio_oss_hdl *hdl)
int wbpf; int wbpf;
DPRINTFN(2, "sio_oss_xrun:\n"); DPRINTFN(2, "sio_oss_xrun:\n");
#ifdef DEBUG
if (_sndio_debug >= 2) if (_sndio_debug >= 2)
_sio_printpos(&hdl->sio); _sio_printpos(&hdl->sio);
#endif
/* /*
* we assume rused/wused are zero if rec/play modes are not * we assume rused/wused are zero if rec/play modes are not

View File

@ -54,7 +54,7 @@
/* /*
* limits * limits
*/ */
#define NCHAN_MAX 16 /* max channel in a stream */ #define NCHAN_MAX 64 /* max channel in a stream */
#define RATE_MIN 4000 /* min sample rate */ #define RATE_MIN 4000 /* min sample rate */
#define RATE_MAX 192000 /* max sample rate */ #define RATE_MAX 192000 /* max sample rate */
#define BITS_MIN 1 /* min bits per sample */ #define BITS_MIN 1 /* min bits per sample */