mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed memcpy use

Browse source
This commit is contained in:
Abramo Bagnara 2000-06-11 13:31:46 +00:00
parent e8cac7de4d
commit c956c5a024
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pcm/pcm.c
View file

@ -165,12 +165,12 @@ int snd_pcm_stream_setup(snd_pcm_t *pcm, snd_pcm_stream_setup_t *setup)
str = &pcm->stream[setup->stream]; str = &pcm->stream[setup->stream];
assert(str->open); assert(str->open);
if (str->valid_setup) { if (str->valid_setup) {
memcpy(setup, &str->setup, sizeof(*setup)); *setup = str->setup;
return 0; return 0;
} }
if ((err = pcm->ops->stream_setup(pcm, setup)) < 0) if ((err = pcm->ops->stream_setup(pcm, &str->setup)) < 0)
return err; return err;
memcpy(&str->setup, setup, sizeof(*setup)); *setup = str->setup;
str->bits_per_sample = snd_pcm_format_physical_width(setup->format.format); str->bits_per_sample = snd_pcm_format_physical_width(setup->format.format);
str->bits_per_frame = str->bits_per_sample * setup->format.channels; str->bits_per_frame = str->bits_per_sample * setup->format.channels;
str->valid_setup = 1; str->valid_setup = 1;

16
src/pcm/pcm_common.c
View file

@ -139,10 +139,10 @@ int snd_pcm_plugin_build(snd_pcm_plugin_handle_t *handle,
plugin->name = name ? strdup(name) : NULL; plugin->name = name ? strdup(name) : NULL;
plugin->handle = handle; plugin->handle = handle;
plugin->stream = stream; plugin->stream = stream;
memcpy(&plugin->src_format, src_format, sizeof(snd_pcm_format_t)); plugin->src_format = *src_format;
plugin->src_width = snd_pcm_format_physical_width(src_format->format); plugin->src_width = snd_pcm_format_physical_width(src_format->format);
assert(plugin->src_width > 0); assert(plugin->src_width > 0);
memcpy(&plugin->dst_format, dst_format, sizeof(snd_pcm_format_t)); plugin->dst_format = *dst_format;
plugin->dst_width = snd_pcm_format_physical_width(dst_format->format); plugin->dst_width = snd_pcm_format_physical_width(dst_format->format);
assert(plugin->dst_width > 0); assert(plugin->dst_width > 0);
plugin->src_channels = calloc(src_format->channels, sizeof(snd_pcm_plugin_channel_t)); plugin->src_channels = calloc(src_format->channels, sizeof(snd_pcm_plugin_channel_t));
@ -298,7 +298,7 @@ int snd_pcm_plug_slave_params(snd_pcm_stream_params_t *params,
snd_pcm_stream_info_t *slave_info, snd_pcm_stream_info_t *slave_info,
snd_pcm_stream_params_t *slave_params) snd_pcm_stream_params_t *slave_params)
{ {
memcpy(slave_params, params, sizeof(*slave_params)); *slave_params = *params;
if ((slave_info->formats & (1 << params->format.format)) == 0) { if ((slave_info->formats & (1 << params->format.format)) == 0) {
int format = params->format.format; int format = params->format.format;
if ((snd_pcm_plug_formats(slave_info->formats) & (1 << format)) == 0) if ((snd_pcm_plug_formats(slave_info->formats) & (1 << format)) == 0)
@ -392,20 +392,20 @@ int snd_pcm_plug_format(snd_pcm_plugin_handle_t *handle,
switch (params->stream) { switch (params->stream) {
case SND_PCM_STREAM_PLAYBACK: case SND_PCM_STREAM_PLAYBACK:
memcpy(&dstparams, slave_params, sizeof(*slave_params)); dstparams = *slave_params;
srcparams = slave_params; srcparams = slave_params;
memcpy(srcparams, params, sizeof(*params)); *srcparams = *params;
break; break;
case SND_PCM_STREAM_CAPTURE: case SND_PCM_STREAM_CAPTURE:
memcpy(&dstparams, params, sizeof(*params)); dstparams = *params;
srcparams = params; srcparams = params;
memcpy(srcparams, slave_params, sizeof(*slave_params)); *srcparams = *slave_params;
break; break;
default: default:
assert(0); assert(0);
return -EINVAL; return -EINVAL;
} }
memcpy(&tmpparams, srcparams, sizeof(*srcparams)); tmpparams = *srcparams;
pdprintf("srcparams: interleave=%i, format=%i, rate=%i, channels=%i\n", pdprintf("srcparams: interleave=%i, format=%i, rate=%i, channels=%i\n",
srcparams->format.interleave, srcparams->format.interleave,

2
src/pcm/pcm_plug.c
View file

@ -357,7 +357,7 @@ static int snd_pcm_plug_stream_params(snd_pcm_t *pcm, snd_pcm_stream_params_t *p
snd_pcm_plug_clear(pcm, stream); snd_pcm_plug_clear(pcm, stream);
/* add necessary plugins */ /* add necessary plugins */
memcpy(&params1, params, sizeof(*params)); params1 = *params;
if ((err = snd_pcm_plug_format(pcm, &params1, &slave_params)) < 0) if ((err = snd_pcm_plug_format(pcm, &params1, &slave_params)) < 0)
return err; return err;