Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv13195
Modified Files:
pcm_plugin.c pcm_plugin.h
Log Message:
removed unused functions.
Index: pcm_plugin.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcm_plugin.c 24 Jul 2003 13:33:52 -0000 1.15
+++ pcm_plugin.c 6 Aug 2003 17:45:09 -0000 1.16
@@ -923,47 +923,6 @@
return 0;
}
-int snd_pcm_areas_silence(const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t
dst_offset,
- unsigned int channels, snd_pcm_uframes_t frames, int format)
-{
- int width = snd_pcm_format_physical_width(format);
- while (channels > 0) {
- void *addr = dst_areas->addr;
- unsigned int step = dst_areas->step;
- const snd_pcm_channel_area_t *begin = dst_areas;
- int vc = channels;
- unsigned int v = 0;
- int err;
- while (1) {
- vc--;
- v++;
- dst_areas++;
- if (vc == 0 ||
- dst_areas->addr != addr ||
- dst_areas->step != step ||
- dst_areas->first != dst_areas[-1].first + width)
- break;
- }
- if (v > 1 && v * width == step) {
- /* Collapse the areas */
- snd_pcm_channel_area_t d;
- d.addr = begin->addr;
- d.first = begin->first;
- d.step = width;
- err = snd_pcm_area_silence(&d, dst_offset * v, frames * v,
format);
- channels -= v;
- } else {
- err = snd_pcm_area_silence(begin, dst_offset, frames, format);
- dst_areas = begin + 1;
- channels--;
- }
- if (err < 0)
- return err;
- }
- return 0;
-}
-
-
int snd_pcm_area_copy(const snd_pcm_channel_area_t *src_area, size_t src_offset,
const snd_pcm_channel_area_t *dst_area, size_t dst_offset,
size_t samples, int format)
@@ -1055,53 +1014,6 @@
}
default:
snd_BUG();
- }
- return 0;
-}
-
-int snd_pcm_areas_copy(const snd_pcm_channel_area_t *src_areas, snd_pcm_uframes_t
src_offset,
- const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t
dst_offset,
- unsigned int channels, snd_pcm_uframes_t frames, int format)
-{
- int width = snd_pcm_format_physical_width(format);
- while (channels > 0) {
- unsigned int step = src_areas->step;
- void *src_addr = src_areas->addr;
- const snd_pcm_channel_area_t *src_start = src_areas;
- void *dst_addr = dst_areas->addr;
- const snd_pcm_channel_area_t *dst_start = dst_areas;
- int vc = channels;
- unsigned int v = 0;
- while (dst_areas->step == step) {
- vc--;
- v++;
- src_areas++;
- dst_areas++;
- if (vc == 0 ||
- src_areas->step != step ||
- src_areas->addr != src_addr ||
- dst_areas->addr != dst_addr ||
- src_areas->first != src_areas[-1].first + width ||
- dst_areas->first != dst_areas[-1].first + width)
- break;
- }
- if (v > 1 && v * width == step) {
- /* Collapse the areas */
- snd_pcm_channel_area_t s, d;
- s.addr = src_start->addr;
- s.first = src_start->first;
- s.step = width;
- d.addr = dst_start->addr;
- d.first = dst_start->first;
- d.step = width;
- snd_pcm_area_copy(&s, src_offset * v, &d, dst_offset * v,
frames * v, format);
- channels -= v;
- } else {
- snd_pcm_area_copy(src_start, src_offset, dst_start,
dst_offset, frames, format);
- src_areas = src_start + 1;
- dst_areas = dst_start + 1;
- channels--;
- }
}
return 0;
}
Index: pcm_plugin.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pcm_plugin.h 21 Jul 2003 14:12:05 -0000 1.4
+++ pcm_plugin.h 6 Aug 2003 17:45:09 -0000 1.5
@@ -219,14 +219,9 @@
int snd_pcm_area_silence(const snd_pcm_channel_area_t *dst_channel, size_t dst_offset,
size_t samples, int format);
-int snd_pcm_areas_silence(const snd_pcm_channel_area_t *dst_channels,
snd_pcm_uframes_t dst_offset,
- unsigned int channels, snd_pcm_uframes_t frames, int format);
int snd_pcm_area_copy(const snd_pcm_channel_area_t *src_channel, size_t src_offset,
const snd_pcm_channel_area_t *dst_channel, size_t dst_offset,
size_t samples, int format);
-int snd_pcm_areas_copy(const snd_pcm_channel_area_t *src_channels, snd_pcm_uframes_t
src_offset,
- const snd_pcm_channel_area_t *dst_channels, snd_pcm_uframes_t
dst_offset,
- unsigned int channels, snd_pcm_uframes_t frames, int format);
void *snd_pcm_plug_buf_alloc(snd_pcm_plug_t *plug, snd_pcm_uframes_t size);
void snd_pcm_plug_buf_unlock(snd_pcm_plug_t *plug, void *ptr);
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
