Removed obsolete code

diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c
index d0ee3abc92bffce4f3547cffeb1dbc38efd8444e..70d25e0964d5025dd1dc5d679595a0c7e969dfe1 100644 (file)
--- a/src/pcm/pcm_adpcm.c
+++ b/src/pcm/pcm_adpcm.c
@@ -210,15 +210,6 @@ void snd_pcm_adpcm_decode(const snd_pcm_channel_area_t *dst_areas,
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(dst_area, dst_offset, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                srcbit = src_area->first + src_area->step * src_offset;
                src = src_area->addr + srcbit / 8;
                srcbit %= 8;
@@ -272,15 +263,6 @@ void snd_pcm_adpcm_encode(const snd_pcm_channel_area_t *dst_areas,
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(dst_area, dst_offset, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                src_step = snd_pcm_channel_area_step(src_area);
                dstbit = dst_area->first + dst_area->step * dst_offset;

diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c
index ae564268ca889264c18a57bba2c0a455a1791ff5..6c1a799beef4b6dae1ab729cab5f7fd897624f60 100644 (file)
--- a/src/pcm/pcm_alaw.c
+++ b/src/pcm/pcm_alaw.c
@@ -138,15 +138,6 @@ void snd_pcm_alaw_decode(const snd_pcm_channel_area_t *dst_areas,
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(&dst_areas[channel], dst_offset, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);
@@ -184,15 +175,6 @@ void snd_pcm_alaw_encode(const snd_pcm_channel_area_t *dst_areas,
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(&dst_area->area, 0, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index ad5b8c72589d9003888909e4fdb0d2c248632a59..d3dc3d3dfdbb3b73223a3edd36472746f997758d 100644 (file)
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -460,15 +460,6 @@ static snd_pcm_sframes_t snd_pcm_hw_avail_update(snd_pcm_t *pcm)
 {
        snd_pcm_uframes_t avail;
        snd_pcm_sframes_t err;
-#if 0
-       if (pcm->ready_mode == SND_PCM_READY_ASAP ||
-           pcm->xrun_mode == SND_PCM_XRUN_ASAP) {
-               snd_pcm_sframes_t d;
-               int err = snd_pcm_hw_delay(pcm, &d);
-               if (err < 0)
-                       return err;
-       }
-#endif
        if (pcm->stream == SND_PCM_STREAM_PLAYBACK) {
                avail = snd_pcm_mmap_playback_avail(pcm);
        } else {

diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c
index 45d2510ca5d978dd4c660450ef270610c322fabf..21224bdfb57f9e69a8fb89acf5237ec71d1077ba 100644 (file)
--- a/src/pcm/pcm_linear.c
+++ b/src/pcm/pcm_linear.c
@@ -104,15 +104,6 @@ void snd_pcm_linear_convert(const snd_pcm_channel_area_t *dst_areas, snd_pcm_ufr
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(dst_area, dst_offset, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);

diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
index 54f9b2625cddbaa093ceb9a7f7b2be59cb58a29d..fed127b11d7f0521efbd8dc8c43dba2c87a99567 100644 (file)
--- a/src/pcm/pcm_mmap.c
+++ b/src/pcm/pcm_mmap.c
@@ -410,10 +410,6 @@ int snd_pcm_munmap(snd_pcm_t *pcm)
                size = page_align(size);
                switch (i->type) {
                case SND_PCM_AREA_MMAP:
-#if 0
-                       /* Tricky here: for alsa-oss */
-                       errno = 12345;
-#endif
                        err = munmap(i->addr, size);
                        if (err < 0) {
                                SYSERR("mmap failed");

diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c
index 028f975b8a9caf62ffb465f01823889243b305f1..ff9a2e8bf70b7bf57df151e13e76a06a925647e4 100644 (file)
--- a/src/pcm/pcm_mulaw.c
+++ b/src/pcm/pcm_mulaw.c
@@ -155,15 +155,6 @@ void snd_pcm_mulaw_decode(const snd_pcm_channel_area_t *dst_areas,
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(&dst_areas[channel], dst_offset, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);
@@ -201,15 +192,6 @@ void snd_pcm_mulaw_encode(const snd_pcm_channel_area_t *dst_areas,
                snd_pcm_uframes_t frames1;
                const snd_pcm_channel_area_t *src_area = &src_areas[channel];
                const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(&dst_area->area, 0, frames, dst_sfmt);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index 1fc6f39777e90c2cfaed7e6cfdc461fa6fc959b1..29a4a48a415e7ea32538371fc21f2e387e20294a 100644 (file)
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -88,15 +88,6 @@ snd_pcm_uframes_t snd_pcm_rate_expand(const snd_pcm_channel_area_t *dst_areas,
                int src_step, dst_step;
                int16_t old_sample = states->sample;
                unsigned int pos = states->pos;
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(&dst_area->area, 0, dst_frames, plugin->dst_format);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);
@@ -173,15 +164,6 @@ snd_pcm_uframes_t snd_pcm_rate_shrink(const snd_pcm_channel_area_t *dst_areas,
                int src_step, dst_step;
                sum = states->sum;
                pos = states->pos;
-#if 0
-               if (!src_area->enabled) {
-                       if (dst_area->wanted)
-                               snd_pcm_area_silence(&dst_area->area, 0, dst_frames, plugin->dst_format);
-                       dst_area->enabled = 0;
-                       continue;
-               }
-               dst_area->enabled = 1;
-#endif
                src = snd_pcm_channel_area_addr(src_area, src_offset);
                dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
                src_step = snd_pcm_channel_area_step(src_area);

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index 1216114b76f62e841c0c42e8b83fffcadf13985a..e60bf751f08eb96e86543861adadc54a670f34dc 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -95,13 +95,7 @@ void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
                                 const snd_pcm_route_ttable_dst_t* ttable ATTRIBUTE_UNUSED,
                                 const snd_pcm_route_params_t *params)
 {
-#if 0
-       if (dst_area->wanted)
-               snd_pcm_area_silence(dst_area, dst_offset, frames, params->dst_sfmt);
-       dsts_area->enabled = 0;
-#else
        snd_pcm_area_silence(dst_area, dst_offset, frames, params->dst_sfmt);
-#endif
 }
 
 void snd_pcm_route_convert1_one(const snd_pcm_channel_area_t *dst_area,
@@ -133,9 +127,6 @@ void snd_pcm_route_convert1_one(const snd_pcm_channel_area_t *dst_area,
                return;
        }
        
-#if 0
-       dst_area->enabled = 1;
-#endif
        conv = conv_labels[params->conv_idx];
        src = snd_pcm_channel_area_addr(src_area, src_offset);
        dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
@@ -216,10 +207,6 @@ void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area,
        int srcidx, srcidx1 = 0;
        for (srcidx = 0; srcidx < nsrcs; ++srcidx) {
                const snd_pcm_channel_area_t *src_area = &src_areas[ttable->srcs[srcidx].channel];
-#if 0
-               if (!src_area->enabled)
-                       continue;
-#endif
                srcs[srcidx1] = snd_pcm_channel_area_addr(src_area, src_offset);
                src_steps[srcidx1] = snd_pcm_channel_area_step(src_area);
                src_tt[srcidx1] = ttable->srcs[srcidx];
@@ -238,9 +225,6 @@ void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area,
                return;
        }
 
-#if 0
-       dst_area->enabled = 1;
-#endif
        zero = zero_labels[params->sum_idx];
        get = get_labels[params->get_idx];
        add = add_labels[params->sum_idx * 2 + ttable->att];