asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:05:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

axfer: minor code arrangement to allocate containers

Browse source 
This commit unifies duplicated code to allocate for container structure.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Sakamoto 2021-03-11 14:21:35 +09:00 committed by Jaroslav Kysela
parent 85ab708f50
commit 4bf9e269b2
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
axfer/subcmd-transfer.c
View file

@ -146,6 +146,16 @@ static int context_init(struct context *ctx, snd_pcm_stream_t direction,
return xfer_context_init(&ctx->xfer, xfer_type, direction, argc, argv);
}
static int allocate_containers(struct context *ctx, unsigned int count)
{
ctx->cntrs = calloc(count, sizeof(*ctx->cntrs));
if (ctx->cntrs == NULL)
return -ENOMEM;
ctx->cntr_count = count;
return 0;
}
static int capture_pre_process(struct context *ctx, snd_pcm_access_t *access,
snd_pcm_uframes_t *frames_per_buffer,
uint64_t *total_frame_count)
@ -164,10 +174,9 @@ static int capture_pre_process(struct context *ctx, snd_pcm_access_t *access,
return err;
// Prepare for containers.
ctx->cntrs = calloc(ctx->xfer.path_count, sizeof(*ctx->cntrs));
if (ctx->cntrs == NULL)
return -ENOMEM;
ctx->cntr_count = ctx->xfer.path_count;
err = allocate_containers(ctx, ctx->xfer.path_count);
if (err < 0)
return err;
if (ctx->cntr_count > 1)
channels = 1;
@ -212,10 +221,9 @@ static int playback_pre_process(struct context *ctx, snd_pcm_access_t *access,
int err;
// Prepare for containers.
ctx->cntrs = calloc(ctx->xfer.path_count, sizeof(*ctx->cntrs));
if (ctx->cntrs == NULL)
return -ENOMEM;
ctx->cntr_count = ctx->xfer.path_count;
err = allocate_containers(ctx, ctx->xfer.path_count);
if (err < 0)
return err;
for (i = 0; i < ctx->cntr_count; ++i) {
snd_pcm_format_t format;