Fixed some typos

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index 058901e837dad5f948a33c23ab4a62112107adc3..761953b22e0aac0732b3699b596e3c1985162efd 100644 (file)
--- 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 89d1074aecbfc167916912693c8b4b5cf66113f5..fcbffbe0db807ef7edf9df2be06255b7db41f761 100644 (file)
--- 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 87642d251c02713a074b86f03498c10377c0de14..7cc5f43a60d84fd8ec0032fd4d293ccf2008119d 100644 (file)
--- 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 d3afe4dd416dd816ea7e4010c08596cafca1125f..fda56bedcb1651d0a9cd9639243eb7c63fd455d9 100644 (file)
--- 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 47d9e88c55b485a9e4ec21cf3232fe08e0bf27b3..9cded476f00633c8642ebf4fda1acafa7d6adf0b 100644 (file)
--- 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 420b64e2f2078fa884ddd46a29e6a1345bd15162..6e3b78ea7e4b79845b2e77e5e5fae10822511f0f 100644 (file)
--- 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;