Commit b1a5077b authored by Jaroslav Kysela's avatar Jaroslav Kysela

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.
parent 4b9d2c1d
...@@ -646,6 +646,7 @@ snd_pcm_sframes_t snd_pcm_plug_client_channels_buf(snd_pcm_plug_t *plug, ...@@ -646,6 +646,7 @@ snd_pcm_sframes_t snd_pcm_plug_client_channels_buf(snd_pcm_plug_t *plug,
nchannels = format->channels; nchannels = format->channels;
snd_assert(plugin->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED || format->channels <= 1, return -ENXIO); snd_assert(plugin->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED || format->channels <= 1, return -ENXIO);
for (channel = 0; channel < nchannels; channel++, v++) { for (channel = 0; channel < nchannels; channel++, v++) {
v->frames = count;
v->enabled = 1; v->enabled = 1;
v->wanted = (stream == SNDRV_PCM_STREAM_CAPTURE); v->wanted = (stream == SNDRV_PCM_STREAM_CAPTURE);
v->area.addr = buf; v->area.addr = buf;
......
...@@ -243,9 +243,9 @@ void zero_channel(snd_pcm_plugin_t *plugin, ...@@ -243,9 +243,9 @@ void zero_channel(snd_pcm_plugin_t *plugin,
size_t samples); size_t samples);
#ifdef PLUGIN_DEBUG #ifdef PLUGIN_DEBUG
#define pdprintf( args... ) printk( "plugin: " ##args) #define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args)
#else #else
#define pdprintf( args... ) { ; } #define pdprintf( fmt, args... )
#endif #endif
#endif /* __PCM_PLUGIN_H */ #endif /* __PCM_PLUGIN_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment