Renamed for congruency two fields

diff --git a/include/pcm.h b/include/pcm.h
index 0dc992f0c31d9761e3e714215c028466311c0a37..f58c3296676bc020f1d40279a54bb3b4ff2b55ca 100644 (file)
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -26,6 +26,7 @@ int snd_pcm_info(snd_pcm_t *handle, snd_pcm_info_t * info);
 int snd_pcm_channel_info(snd_pcm_t *handle, snd_pcm_channel_info_t * info);
 int snd_pcm_channel_params(snd_pcm_t *handle, snd_pcm_channel_params_t * params);
 int snd_pcm_channel_setup(snd_pcm_t *handle, snd_pcm_channel_setup_t * setup);
+int snd_pcm_voice_setup(snd_pcm_t *handle, int channel, snd_pcm_voice_setup_t * setup);
 int snd_pcm_channel_status(snd_pcm_t *handle, snd_pcm_channel_status_t * status);
 int snd_pcm_playback_prepare(snd_pcm_t *handle);
 int snd_pcm_capture_prepare(snd_pcm_t *handle);
@@ -86,8 +87,8 @@ typedef enum {
 typedef struct snd_stru_pcm_plugin_voice {
        void *aptr;                     /* pointer to the allocated area */
        void *addr;                     /* address to voice samples */
-       unsigned int offset;            /* offset to first voice in bits */
-       unsigned int next;              /* offset to next voice in bits */
+       unsigned int first;             /* offset to first sample in bits */
+       unsigned int step;              /* samples distance in bits */
 } snd_pcm_plugin_voice_t;
 
 struct snd_stru_pcm_plugin {

diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index bcc7a206c67ee3514598e17ce7fc862c30a7ce78..d0f1afd8b0b79045f00c5b8efe28d25f8cbd7fe2 100644 (file)
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -487,8 +487,8 @@ static int snd_pcm_plugin_load_vector(snd_pcm_plugin_t *plugin,
                        v->aptr = NULL;
                        if ((v->addr = vector->iov_base) == NULL)
                                return -EINVAL;
-                       v->offset = voice * width;
-                       v->next = cvoices * width;
+                       v->first = voice * width;
+                       v->step = cvoices * width;
                }
        } else {
                if (count != cvoices)
@@ -496,8 +496,8 @@ static int snd_pcm_plugin_load_vector(snd_pcm_plugin_t *plugin,
                for (voice = 0; voice < cvoices; voice++, v++) {
                        v->aptr = NULL;
                        v->addr = vector[voice].iov_base;
-                       v->offset = 0;
-                       v->next = width;
+                       v->first = 0;
+                       v->step = width;
                }               
        }
        *voices = plugin->voices;
@@ -868,12 +868,12 @@ static int snd_pcm_plugin_xvoices(snd_pcm_plugin_t *plugin,
                v->aptr = ptr;
                if (format->interleave) {
                        v->addr = ptr;
-                       v->offset = voice * width;
-                       v->next = format->voices * width;
+                       v->first = voice * width;
+                       v->step = format->voices * width;
                } else {
                        v->addr = ptr + (voice * size);
-                       v->offset = 0;
-                       v->next = width;
+                       v->first = 0;
+                       v->step = width;
                }
        }
        *voices = plugin->voices;