From 4ecd9eaa46388fc31b6357aca13bc146ee5ca00e Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Sun, 4 Feb 2001 22:59:24 +0000 Subject: [PATCH] Fixed some typos --- src/pcm/pcm_local.h | 2 +- src/pcm/pcm_mmap.c | 8 ++++---- src/pcm/pcm_plug.c | 2 +- src/pcm/pcm_rate.c | 8 ++++---- src/pcm/pcm_route.c | 8 ++++---- src/rawmidi/rawmidi.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index 058901e8..761953b2 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -387,7 +387,7 @@ static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params, static inline int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params, snd_pcm_subformat_t val) { - return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT, + return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT, (unsigned long) val, 0); } diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c index 89d1074a..fcbffbe0 100644 --- a/src/pcm/pcm_mmap.c +++ b/src/pcm/pcm_mmap.c @@ -161,10 +161,10 @@ snd_pcm_sframes_t snd_pcm_mmap_write_areas(snd_pcm_t *pcm, } snd_pcm_sframes_t snd_pcm_mmap_read_areas(snd_pcm_t *pcm, - const snd_pcm_channel_area_t *areas, - snd_pcm_uframes_t offset, - snd_pcm_uframes_t size, - snd_pcm_uframes_t *slave_sizep) + const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t size, + snd_pcm_uframes_t *slave_sizep) { snd_pcm_uframes_t xfer; if (slave_sizep && *slave_sizep < size) diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index 87642d25..7cc5f43a 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -576,7 +576,7 @@ static int snd_pcm_plug_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) clt_params.channels == slv_params.channels && clt_params.rate == slv_params.rate && snd_pcm_hw_params_set_access(slave, &sparams, SND_TEST, - clt_params.access))) { + clt_params.access) >= 0)) { slv_params.access = snd_pcm_hw_params_set_access_first(slave, &sparams); err = snd_pcm_plug_insert_plugins(pcm, &clt_params, &slv_params); if (err < 0) diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index d3afe4dd..fda56bed 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -469,10 +469,10 @@ static snd_pcm_sframes_t snd_pcm_rate_write_areas(snd_pcm_t *pcm, } static snd_pcm_sframes_t snd_pcm_rate_read_areas(snd_pcm_t *pcm, - const snd_pcm_channel_area_t *areas, - snd_pcm_uframes_t client_offset, - snd_pcm_uframes_t client_size, - snd_pcm_uframes_t *slave_sizep) + const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t client_offset, + snd_pcm_uframes_t client_size, + snd_pcm_uframes_t *slave_sizep) { snd_pcm_rate_t *rate = pcm->private; diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c index 47d9e88c..9cded476 100644 --- a/src/pcm/pcm_route.c +++ b/src/pcm/pcm_route.c @@ -585,8 +585,8 @@ static snd_pcm_sframes_t snd_pcm_route_write_areas(snd_pcm_t *pcm, assert(size > 0); while (xfer < size) { snd_pcm_uframes_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer); - snd_pcm_route_convert(areas, offset, - snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), + snd_pcm_route_convert(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), + areas, offset, slave->channels, frames, &route->params); err = snd_pcm_mmap_forward(slave, frames); if (err < 0) @@ -619,8 +619,8 @@ static snd_pcm_sframes_t snd_pcm_route_read_areas(snd_pcm_t *pcm, assert(size > 0); while (xfer < size) { snd_pcm_uframes_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer); - snd_pcm_route_convert(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), - areas, offset, + snd_pcm_route_convert(areas, offset, + snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), pcm->channels, frames, &route->params); err = snd_pcm_mmap_forward(slave, frames); if (err < 0) diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c index 420b64e2..6e3b78ea 100644 --- a/src/rawmidi/rawmidi.c +++ b/src/rawmidi/rawmidi.c @@ -151,7 +151,7 @@ int snd_rawmidi_params_current(snd_rawmidi_t *rmidi, snd_rawmidi_stream_t stream int snd_rawmidi_params_default(snd_rawmidi_t *rmidi, snd_rawmidi_stream_t stream, snd_rawmidi_params_t *params) { - assert(snd_rawmidi_stream_ok(rmidi, SND_RAWMIDI_STREAM_OUTPUT)); + assert(snd_rawmidi_stream_ok(rmidi, stream)); assert(params); params->buffer_size = PAGE_SIZE; params->avail_min = 1; -- 2.47.3