Renamed for congruency two fields

diff --git a/src/pcm/plugin/adpcm.c b/src/pcm/plugin/adpcm.c
index 4100021720f35539bd7ebb0f9b17ed327e437937..4b55873bdfb896f305918ae5fa791d2d1eb96ab1 100644 (file)
--- a/src/pcm/plugin/adpcm.c
+++ b/src/pcm/plugin/adpcm.c
@@ -236,12 +236,12 @@ static void adpcm_decode(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               srcbit = src_voices[voice].offset % 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               srcbit_step = src_voices[voice].next % 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               srcbit = src_voices[voice].first % 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               srcbit_step = src_voices[voice].step % 8;
+               dst_step = dst_voices[voice].step / 8;
                state = &data->voices[voice];
                samples1 = samples;
                while (samples1-- > 0) {
@@ -295,12 +295,12 @@ static void adpcm_encode(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               dstbit = dst_voices[voice].offset % 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
-               dstbit_step = dst_voices[voice].next % 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               dstbit = dst_voices[voice].first % 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
+               dstbit_step = dst_voices[voice].step % 8;
                state = &data->voices[voice];
                samples1 = samples;
                while (samples1-- > 0) {
@@ -345,16 +345,16 @@ static ssize_t adpcm_transfer(snd_pcm_plugin_t *plugin,
                    dst_voices[voice].addr == NULL)
                        return -EFAULT;
                if (plugin->src_format.format == SND_PCM_SFMT_IMA_ADPCM) {
-                       if (src_voices[voice].offset % 4 != 0 ||
-                           src_voices[voice].next % 4 != 0 ||
-                           dst_voices[voice].offset % 8 != 0 ||
-                           dst_voices[voice].next % 8 != 0)
+                       if (src_voices[voice].first % 4 != 0 ||
+                           src_voices[voice].step % 4 != 0 ||
+                           dst_voices[voice].first % 8 != 0 ||
+                           dst_voices[voice].step % 8 != 0)
                                return -EINVAL;
                } else {
-                       if (src_voices[voice].offset % 8 != 0 ||
-                           src_voices[voice].next % 8 != 0 ||
-                           dst_voices[voice].offset % 4 != 0 ||
-                           dst_voices[voice].next % 4 != 0)
+                       if (src_voices[voice].first % 8 != 0 ||
+                           src_voices[voice].step % 8 != 0 ||
+                           dst_voices[voice].first % 4 != 0 ||
+                           dst_voices[voice].step % 4 != 0)
                                return -EINVAL;
                }
        }

diff --git a/src/pcm/plugin/alaw.c b/src/pcm/plugin/alaw.c
index 13421e5cba893ea229bba22f539e6e94d7dcba55..8d6b4e42a275007b889a892a2c01b22c0c59f8f1 100644 (file)
--- a/src/pcm/plugin/alaw.c
+++ b/src/pcm/plugin/alaw.c
@@ -166,10 +166,10 @@ static void alaw_decode(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                samples1 = samples;
                while (samples1-- > 0) {
                        signed short sample = alaw2linear(*src);
@@ -209,10 +209,10 @@ static void alaw_encode(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                samples1 = samples;
                while (samples1-- > 0) {
                        goto *get;
@@ -245,11 +245,11 @@ static ssize_t alaw_transfer(snd_pcm_plugin_t *plugin,
                if (src_voices[voice].addr != NULL && 
                    dst_voices[voice].addr == NULL)
                        return -EFAULT;
-               if (src_voices[voice].offset % 8 != 0 || 
-                   src_voices[voice].next % 8 != 0)
+               if (src_voices[voice].first % 8 != 0 || 
+                   src_voices[voice].step % 8 != 0)
                        return -EINVAL;
-               if (dst_voices[voice].offset % 8 != 0 || 
-                   dst_voices[voice].next % 8 != 0)
+               if (dst_voices[voice].first % 8 != 0 || 
+                   dst_voices[voice].step % 8 != 0)
                        return -EINVAL;
        }
        data = (alaw_t *)plugin->extra_data;

diff --git a/src/pcm/plugin/linear.c b/src/pcm/plugin/linear.c
index c99c3d9854262ba9fc36776b6bbc3da354ee50f2..ed499b15a8b811962f201b24c7c93956abb01704 100644 (file)
--- a/src/pcm/plugin/linear.c
+++ b/src/pcm/plugin/linear.c
@@ -68,10 +68,10 @@ static void convert(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                samples1 = samples;
                while (samples1-- > 0) {
                        goto *copy;
@@ -104,11 +104,11 @@ static ssize_t linear_transfer(snd_pcm_plugin_t *plugin,
                if (src_voices[voice].addr != NULL && 
                    dst_voices[voice].addr == NULL)
                        return -EFAULT;
-               if (src_voices[voice].offset % 8 != 0 || 
-                   src_voices[voice].next % 8 != 0)
+               if (src_voices[voice].first % 8 != 0 || 
+                   src_voices[voice].step % 8 != 0)
                        return -EINVAL;
-               if (dst_voices[voice].offset % 8 != 0 || 
-                   dst_voices[voice].next % 8 != 0)
+               if (dst_voices[voice].first % 8 != 0 || 
+                   dst_voices[voice].step % 8 != 0)
                        return -EINVAL;
        }
        convert(plugin, src_voices, dst_voices, samples);

diff --git a/src/pcm/plugin/mulaw.c b/src/pcm/plugin/mulaw.c
index c6b3e9cfe6588bf1528b9adbb3063d69921741b5..a76a3ab9607081e2be7bd8ff9bce2805b97af877 100644 (file)
--- a/src/pcm/plugin/mulaw.c
+++ b/src/pcm/plugin/mulaw.c
@@ -182,10 +182,10 @@ static void mulaw_decode(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                samples1 = samples;
                while (samples1-- > 0) {
                        signed short sample = ulaw2linear(*src);
@@ -225,10 +225,10 @@ static void mulaw_encode(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                samples1 = samples;
                while (samples1-- > 0) {
                        goto *get;
@@ -261,11 +261,11 @@ static ssize_t mulaw_transfer(snd_pcm_plugin_t *plugin,
                if (src_voices[voice].addr != NULL && 
                    dst_voices[voice].addr == NULL)
                        return -EFAULT;
-               if (src_voices[voice].offset % 8 != 0 || 
-                   src_voices[voice].next % 8 != 0)
+               if (src_voices[voice].first % 8 != 0 || 
+                   src_voices[voice].step % 8 != 0)
                        return -EINVAL;
-               if (dst_voices[voice].offset % 8 != 0 || 
-                   dst_voices[voice].next % 8 != 0)
+               if (dst_voices[voice].first % 8 != 0 || 
+                   dst_voices[voice].step % 8 != 0)
                        return -EINVAL;
        }
        data = (mulaw_t *)plugin->extra_data;

diff --git a/src/pcm/plugin/rate.c b/src/pcm/plugin/rate.c
index e943e31b45c46ea3add85802565f00fccd4177db..7bba217cee12866d6955ab8e0e93fa8b75b203c6 100644 (file)
--- a/src/pcm/plugin/rate.c
+++ b/src/pcm/plugin/rate.c
@@ -111,10 +111,10 @@ static void resample_expand(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = (char *)src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = (char *)dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = (char *)src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = (char *)dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                src_samples1 = src_samples;
                dst_samples1 = dst_samples;
                if (pos & ~MASK) {
@@ -195,10 +195,10 @@ static void resample_shrink(snd_pcm_plugin_t *plugin,
                        }
                        continue;
                }
-               src = (char *)src_voices[voice].addr + src_voices[voice].offset / 8;
-               dst = (char *)dst_voices[voice].addr + dst_voices[voice].offset / 8;
-               src_step = src_voices[voice].next / 8;
-               dst_step = dst_voices[voice].next / 8;
+               src = (char *)src_voices[voice].addr + src_voices[voice].first / 8;
+               dst = (char *)dst_voices[voice].addr + dst_voices[voice].first / 8;
+               src_step = src_voices[voice].step / 8;
+               dst_step = dst_voices[voice].step / 8;
                src_samples1 = src_samples;
                dst_samples1 = dst_samples;
                while (dst_samples1 > 0) {
@@ -318,11 +318,11 @@ static ssize_t rate_transfer(snd_pcm_plugin_t *plugin,
                if (src_voices[voice].addr != NULL && 
                    dst_voices[voice].addr == NULL)
                        return -EFAULT;
-               if (src_voices[voice].offset % 8 != 0 || 
-                   src_voices[voice].next % 8 != 0)
+               if (src_voices[voice].first % 8 != 0 || 
+                   src_voices[voice].step % 8 != 0)
                        return -EINVAL;
-               if (dst_voices[voice].offset % 8 != 0 || 
-                   dst_voices[voice].next % 8 != 0)
+               if (dst_voices[voice].first % 8 != 0 || 
+                   dst_voices[voice].step % 8 != 0)
                        return -EINVAL;
        }
 

diff --git a/src/pcm/plugin/route.c b/src/pcm/plugin/route.c
index 5d08f9dff81193ac4177cfe3bd4b58887d206945..293cbcb991318a0e8a478ce86ee7a6c4c929efbf 100644 (file)
--- a/src/pcm/plugin/route.c
+++ b/src/pcm/plugin/route.c
@@ -83,12 +83,12 @@ void zero_voice(snd_pcm_plugin_t *plugin,
                const snd_pcm_plugin_voice_t *dst_voice,
                size_t samples)
 {
-       char *dst = dst_voice->addr + dst_voice->offset / 8;
-       int dst_step = dst_voice->next / 8;
+       char *dst = dst_voice->addr + dst_voice->first / 8;
+       int dst_step = dst_voice->step / 8;
        switch (plugin->dst_width) {
        case 4: {
-               int dstbit = dst_voice->offset % 8;
-               int dstbit_step = dst_voice->next % 8;
+               int dstbit = dst_voice->first % 8;
+               int dstbit_step = dst_voice->step % 8;
                while (samples-- > 0) {
                        if (dstbit)
                                *dst &= 0x0f;
@@ -165,10 +165,10 @@ static void route_to_voice_one(snd_pcm_plugin_t *plugin,
        }
 
        copy = copy_labels[data->copy];
-       src = src_voice->addr + src_voice->offset / 8;
-       src_step = src_voice->next / 8;
-       dst = dst_voice->addr + dst_voice->offset / 8;
-       dst_step = dst_voice->next / 8;
+       src = src_voice->addr + src_voice->first / 8;
+       src_step = src_voice->step / 8;
+       dst = dst_voice->addr + dst_voice->first / 8;
+       dst_step = dst_voice->step / 8;
        while (samples-- > 0) {
                goto *copy;
 #define COPY_END after
@@ -244,8 +244,8 @@ static void route_to_voice(snd_pcm_plugin_t *plugin,
                const snd_pcm_plugin_voice_t *src_voice = &src_voices[ttable->srcs[srcidx].voice];
                if (src_voice->addr == NULL)
                        continue;
-               srcs[srcidx1] = src_voice->addr + src_voices->offset / 8;
-               src_steps[srcidx1] = src_voice->next / 8;
+               srcs[srcidx1] = src_voice->addr + src_voices->first / 8;
+               src_steps[srcidx1] = src_voice->step / 8;
                src_tt[srcidx1] = ttable->srcs[srcidx];
                srcidx1++;
        }
@@ -263,8 +263,8 @@ static void route_to_voice(snd_pcm_plugin_t *plugin,
        add = add_labels[data->sum_type * 2 + ttable->att];
        norm = norm_labels[data->sum_type * 8 + ttable->att * 4 + 4 - data->src_sample_size];
        put32 = put32_labels[data->put];
-       dst = dst_voice->addr + dst_voice->offset / 8;
-       dst_step = dst_voice->next / 8;
+       dst = dst_voice->addr + dst_voice->first / 8;
+       dst_step = dst_voice->step / 8;
 
        while (samples-- > 0) {
                ttable_src_t *ttp = src_tt;
@@ -516,15 +516,15 @@ static ssize_t route_transfer(snd_pcm_plugin_t *plugin,
 
        src_nvoices = plugin->src_format.voices;
        for (src_voice = 0; src_voice < src_nvoices; ++src_voice) {
-               if (src_voices[src_voice].offset % 8 != 0 || 
-                   src_voices[src_voice].next % 8 != 0)
+               if (src_voices[src_voice].first % 8 != 0 || 
+                   src_voices[src_voice].step % 8 != 0)
                        return -EINVAL;
        }
 
        dst_nvoices = plugin->dst_format.voices;
        for (dst_voice = 0; dst_voice < dst_nvoices; ++dst_voice) {
-               if (dst_voices[dst_voice].offset % 8 != 0 || 
-                   dst_voices[dst_voice].next % 8 != 0)
+               if (dst_voices[dst_voice].first % 8 != 0 || 
+                   dst_voices[dst_voice].step % 8 != 0)
                        return -EINVAL;
        }