mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix for 16-bit and/or stereo samples...

Browse source
This commit is contained in:
Jaroslav Kysela 1999-09-01 21:53:46 +00:00
parent b520d951fa
commit f247f920e1
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/instr/simple.c
View file

@ -30,7 +30,14 @@
static long simple_size(simple_instrument_t *instr) static long simple_size(simple_instrument_t *instr)
{ {
return sizeof(simple_xinstrument_t) + instr->size; int size;
size = instr->size;
if (instr->format & SIMPLE_WAVE_16BIT)
size <<= 1;
if (instr->format & SIMPLE_WAVE_STEREO)
size <<= 1;
return size;
} }
int snd_instr_simple_convert_to_stream(snd_instr_simple_t *simple, int snd_instr_simple_convert_to_stream(snd_instr_simple_t *simple,
@ -50,8 +57,8 @@ int snd_instr_simple_convert_to_stream(snd_instr_simple_t *simple,
instr = (simple_instrument_t *)simple; instr = (simple_instrument_t *)simple;
*__data = NULL; *__data = NULL;
*__size = 0; *__size = 0;
size = sizeof(*put) + simple_size(simple); size = simple_size(simple);
put = (snd_seq_instr_put_t *)malloc(sizeof(*put) + size); put = (snd_seq_instr_put_t *)malloc(sizeof(*put) + sizeof(simple_xinstrument_t) + size);
if (put == NULL) if (put == NULL)
return -ENOMEM; return -ENOMEM;
/* build header */ /* build header */
@ -79,10 +86,10 @@ int snd_instr_simple_convert_to_stream(snd_instr_simple_t *simple,
xinstr->effect2 = instr->effect2; xinstr->effect2 = instr->effect2;
xinstr->effect2_depth = instr->effect2_depth; xinstr->effect2_depth = instr->effect2_depth;
ptr = (char *)(xinstr + 1); ptr = (char *)(xinstr + 1);
memcpy(ptr, instr->address.ptr, instr->size); memcpy(ptr, instr->address.ptr, size);
/* write result */ /* write result */
*__data = put; *__data = put;
*__size = size; *__size = sizeof(*put) + sizeof(simple_xinstrument_t) + size;
return 0; return 0;
} }