ALSA CVS update

D:2003/09/16 17:34:48
C:ALSA<-OSS emulation
A:Takashi Iwai <tiwai@suse.de>
F:core/oss/pcm_plugin.c:1.16->1.17
F:core/oss/pcm_plugin.h:1.5->1.6
L:- fixed the debug print for the recent gcc.
L:- fixed the missing initialization of the recording frame size through
L:  plugin.  the problem of zero-size read with the rate plugin should
L:  be fixed now.

diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 098e652eec59c1218cb29a2ec6dffaa0bf9e959e..6b519fbcad017ae2962988ee49e15f78e6a478ef 100644 (file)
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -646,6 +646,7 @@ snd_pcm_sframes_t snd_pcm_plug_client_channels_buf(snd_pcm_plug_t *plug,
        nchannels = format->channels;
        snd_assert(plugin->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED || format->channels <= 1, return -ENXIO);
        for (channel = 0; channel < nchannels; channel++, v++) {
+               v->frames = count;
                v->enabled = 1;
                v->wanted = (stream == SNDRV_PCM_STREAM_CAPTURE);
                v->area.addr = buf;

diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h
index 94db5495ea2d70c7197becee27d01fc9de4aa237..342ec09640d2007073a9c738cf6edecd0ca549f5 100644 (file)
--- a/sound/core/oss/pcm_plugin.h
+++ b/sound/core/oss/pcm_plugin.h
@@ -243,9 +243,9 @@ void zero_channel(snd_pcm_plugin_t *plugin,
                  size_t samples);
 
 #ifdef PLUGIN_DEBUG
-#define pdprintf( args... ) printk( "plugin: " ##args)
+#define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args)
 #else
-#define pdprintf( args... ) { ; }
+#define pdprintf( fmt, args... ) 
 #endif
 
 #endif                         /* __PCM_PLUGIN_H */