mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-05 13:30:00 -05:00
dmix: rename mix_areas*
Rename all mix_areas* symbols so that they contain the sample width instead of some meaningless number.
This commit is contained in:
parent
de2b7a42d7
commit
79db4a6bfa
7 changed files with 159 additions and 144 deletions
|
|
@ -2,32 +2,32 @@
|
|||
* optimized mixing code for i386
|
||||
*/
|
||||
|
||||
#define MIX_AREAS1 mix_areas1
|
||||
#define MIX_AREAS1_MMX mix_areas1_mmx
|
||||
#define MIX_AREAS2 mix_areas2
|
||||
#define MIX_AREAS3 mix_areas3
|
||||
#define MIX_AREAS3_CMOV mix_areas3_cmov
|
||||
#define MIX_AREAS_16 mix_areas_16
|
||||
#define MIX_AREAS_16_MMX mix_areas_16_mmx
|
||||
#define MIX_AREAS_32 mix_areas_32
|
||||
#define MIX_AREAS_24 mix_areas_24
|
||||
#define MIX_AREAS_24_CMOV mix_areas_24_cmov
|
||||
#define LOCK_PREFIX ""
|
||||
#include "pcm_dmix_i386.h"
|
||||
#undef MIX_AREAS1
|
||||
#undef MIX_AREAS1_MMX
|
||||
#undef MIX_AREAS2
|
||||
#undef MIX_AREAS3
|
||||
#undef MIX_AREAS3_CMOV
|
||||
#undef MIX_AREAS_16
|
||||
#undef MIX_AREAS_16_MMX
|
||||
#undef MIX_AREAS_32
|
||||
#undef MIX_AREAS_24
|
||||
#undef MIX_AREAS_24_CMOV
|
||||
#undef LOCK_PREFIX
|
||||
|
||||
#define MIX_AREAS1 mix_areas1_smp
|
||||
#define MIX_AREAS1_MMX mix_areas1_smp_mmx
|
||||
#define MIX_AREAS2 mix_areas2_smp
|
||||
#define MIX_AREAS3 mix_areas3_smp
|
||||
#define MIX_AREAS3_CMOV mix_areas3_smp_cmov
|
||||
#define MIX_AREAS_16 mix_areas_16_smp
|
||||
#define MIX_AREAS_16_MMX mix_areas_16_smp_mmx
|
||||
#define MIX_AREAS_32 mix_areas_32_smp
|
||||
#define MIX_AREAS_24 mix_areas_24_smp
|
||||
#define MIX_AREAS_24_CMOV mix_areas_24_smp_cmov
|
||||
#define LOCK_PREFIX "lock ; "
|
||||
#include "pcm_dmix_i386.h"
|
||||
#undef MIX_AREAS1
|
||||
#undef MIX_AREAS1_MMX
|
||||
#undef MIX_AREAS2
|
||||
#undef MIX_AREAS3
|
||||
#undef MIX_AREAS3_CMOV
|
||||
#undef MIX_AREAS_16
|
||||
#undef MIX_AREAS_16_MMX
|
||||
#undef MIX_AREAS_32
|
||||
#undef MIX_AREAS_24
|
||||
#undef MIX_AREAS_24_CMOV
|
||||
#undef LOCK_PREFIX
|
||||
|
||||
#define i386_dmix_supported_format \
|
||||
|
|
@ -70,14 +70,14 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix)
|
|||
}
|
||||
|
||||
if (mmx) {
|
||||
dmix->u.dmix.mix_areas1 = smp > 1 ? mix_areas1_smp_mmx : mix_areas1_mmx;
|
||||
dmix->u.dmix.mix_areas_16 = smp > 1 ? mix_areas_16_smp_mmx : mix_areas_16_mmx;
|
||||
} else {
|
||||
dmix->u.dmix.mix_areas1 = smp > 1 ? mix_areas1_smp : mix_areas1;
|
||||
dmix->u.dmix.mix_areas_16 = smp > 1 ? mix_areas_16_smp : mix_areas_16;
|
||||
}
|
||||
dmix->u.dmix.mix_areas2 = smp > 1 ? mix_areas2_smp : mix_areas2;
|
||||
dmix->u.dmix.mix_areas_32 = smp > 1 ? mix_areas_32_smp : mix_areas_32;
|
||||
if (cmov) {
|
||||
dmix->u.dmix.mix_areas3 = smp > 1 ? mix_areas3_smp_cmov : mix_areas3_cmov;
|
||||
dmix->u.dmix.mix_areas_24 = smp > 1 ? mix_areas_24_smp_cmov : mix_areas_24_cmov;
|
||||
} else {
|
||||
dmix->u.dmix.mix_areas3 = smp > 1 ? mix_areas3_smp: mix_areas3;
|
||||
dmix->u.dmix.mix_areas_24 = smp > 1 ? mix_areas_24_smp: mix_areas_24;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue