mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed for congruency two fields

Browse source
This commit is contained in:
Abramo Bagnara 2000-04-16 15:36:09 +00:00
parent 427a14e32b
commit fe03a4781b
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/pcm.h
View file

@ -26,6 +26,7 @@ int snd_pcm_info(snd_pcm_t *handle, snd_pcm_info_t * info);
int snd_pcm_channel_info(snd_pcm_t *handle, snd_pcm_channel_info_t * info); int snd_pcm_channel_info(snd_pcm_t *handle, snd_pcm_channel_info_t * info);
int snd_pcm_channel_params(snd_pcm_t *handle, snd_pcm_channel_params_t * params); int snd_pcm_channel_params(snd_pcm_t *handle, snd_pcm_channel_params_t * params);
int snd_pcm_channel_setup(snd_pcm_t *handle, snd_pcm_channel_setup_t * setup); int snd_pcm_channel_setup(snd_pcm_t *handle, snd_pcm_channel_setup_t * setup);
int snd_pcm_voice_setup(snd_pcm_t *handle, int channel, snd_pcm_voice_setup_t * setup);
int snd_pcm_channel_status(snd_pcm_t *handle, snd_pcm_channel_status_t * status); int snd_pcm_channel_status(snd_pcm_t *handle, snd_pcm_channel_status_t * status);
int snd_pcm_playback_prepare(snd_pcm_t *handle); int snd_pcm_playback_prepare(snd_pcm_t *handle);
int snd_pcm_capture_prepare(snd_pcm_t *handle); int snd_pcm_capture_prepare(snd_pcm_t *handle);
@ -86,8 +87,8 @@ typedef enum {
typedef struct snd_stru_pcm_plugin_voice { typedef struct snd_stru_pcm_plugin_voice {
void *aptr; /* pointer to the allocated area */ void *aptr; /* pointer to the allocated area */
void *addr; /* address to voice samples */ void *addr; /* address to voice samples */
unsigned int offset; /* offset to first voice in bits */ unsigned int first; /* offset to first sample in bits */
unsigned int next; /* offset to next voice in bits */ unsigned int step; /* samples distance in bits */
} snd_pcm_plugin_voice_t; } snd_pcm_plugin_voice_t;
struct snd_stru_pcm_plugin { struct snd_stru_pcm_plugin {

16
src/pcm/pcm_plugin.c
View file

@ -487,8 +487,8 @@ static int snd_pcm_plugin_load_vector(snd_pcm_plugin_t *plugin,
v->aptr = NULL; v->aptr = NULL;
if ((v->addr = vector->iov_base) == NULL) if ((v->addr = vector->iov_base) == NULL)
return -EINVAL; return -EINVAL;
v->offset = voice * width; v->first = voice * width;
v->next = cvoices * width; v->step = cvoices * width;
} }
} else { } else {
if (count != cvoices) if (count != cvoices)
@ -496,8 +496,8 @@ static int snd_pcm_plugin_load_vector(snd_pcm_plugin_t *plugin,
for (voice = 0; voice < cvoices; voice++, v++) { for (voice = 0; voice < cvoices; voice++, v++) {
v->aptr = NULL; v->aptr = NULL;
v->addr = vector[voice].iov_base; v->addr = vector[voice].iov_base;
v->offset = 0; v->first = 0;
v->next = width; v->step = width;
} }
} }
*voices = plugin->voices; *voices = plugin->voices;
@ -868,12 +868,12 @@ static int snd_pcm_plugin_xvoices(snd_pcm_plugin_t *plugin,
v->aptr = ptr; v->aptr = ptr;
if (format->interleave) { if (format->interleave) {
v->addr = ptr; v->addr = ptr;
v->offset = voice * width; v->first = voice * width;
v->next = format->voices * width; v->step = format->voices * width;
} else { } else {
v->addr = ptr + (voice * size); v->addr = ptr + (voice * size);
v->offset = 0; v->first = 0;
v->next = width; v->step = width;
} }
} }
*voices = plugin->voices; *voices = plugin->voices;