From aecf625c00dadec34d5e99c52349aff4e0147a36 Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Sat, 10 Mar 2001 10:09:34 +0000 Subject: [PATCH] Clearer name --- src/pcm/pcm_route.c | 10 +++---- src/pcm/plugin_ops.h | 66 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c index e60bf751..6b997da9 100644 --- a/src/pcm/pcm_route.c +++ b/src/pcm/pcm_route.c @@ -151,10 +151,10 @@ void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area, const snd_pcm_route_ttable_dst_t* ttable, const snd_pcm_route_params_t *params) { -#define GET_LABELS +#define GETU_LABELS #define PUT32_LABELS #include "plugin_ops.h" -#undef GET_LABELS +#undef GETU_LABELS #undef PUT32_LABELS static void *zero_labels[3] = { &&zero_int32, &&zero_int64, #if ROUTE_PLUGIN_FLOAT @@ -226,7 +226,7 @@ void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area, } zero = zero_labels[params->sum_idx]; - get = get_labels[params->get_idx]; + get = getu_labels[params->get_idx]; add = add_labels[params->sum_idx * 2 + ttable->att]; norm = norm_labels[params->sum_idx * 8 + ttable->att * 4 + 4 - params->src_size]; put32 = put32_labels[params->put_idx]; @@ -256,9 +256,9 @@ void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area, /* Get sample */ goto *get; -#define GET_END after_get +#define GETU_END after_get #include "plugin_ops.h" -#undef GET_END +#undef GETU_END after_get: /* Sum */ diff --git a/src/pcm/plugin_ops.h b/src/pcm/plugin_ops.h index c9ac07c9..de75fbaf 100644 --- a/src/pcm/plugin_ops.h +++ b/src/pcm/plugin_ops.h @@ -444,44 +444,44 @@ put32_1234_4329: as_u32(dst) = bswap_32(sample) ^ 0x80; goto PUT32_END; } #endif -#ifdef GET_LABELS +#ifdef GETU_LABELS /* width endswap sign_toggle */ -static void *get_labels[4 * 2 * 2] = { - &&get_1_1, /* 8h -> 8h */ - &&get_1_9, /* 8h ^> 8h */ - &&get_1_1, /* 8s -> 8h */ - &&get_1_9, /* 8s ^> 8h */ - &&get_12_12, /* 16h -> 16h */ - &&get_12_92, /* 16h ^> 16h */ - &&get_12_21, /* 16s -> 16h */ - &&get_12_A1, /* 16s ^> 16h */ - &&get_0123_0123, /* 24h -> 24h */ - &&get_0123_0923, /* 24h ^> 24h */ - &&get_1230_0321, /* 24s -> 24h */ - &&get_1230_0B21, /* 24s ^> 24h */ - &&get_1234_1234, /* 32h -> 32h */ - &&get_1234_9234, /* 32h ^> 32h */ - &&get_1234_4321, /* 32s -> 32h */ - &&get_1234_C321, /* 32s ^> 32h */ +static void *getu_labels[4 * 2 * 2] = { + &&getu_1_1, /* 8h -> 8h */ + &&getu_1_9, /* 8h ^> 8h */ + &&getu_1_1, /* 8s -> 8h */ + &&getu_1_9, /* 8s ^> 8h */ + &&getu_12_12, /* 16h -> 16h */ + &&getu_12_92, /* 16h ^> 16h */ + &&getu_12_21, /* 16s -> 16h */ + &&getu_12_A1, /* 16s ^> 16h */ + &&getu_0123_0123, /* 24h -> 24h */ + &&getu_0123_0923, /* 24h ^> 24h */ + &&getu_1230_0321, /* 24s -> 24h */ + &&getu_1230_0B21, /* 24s ^> 24h */ + &&getu_1234_1234, /* 32h -> 32h */ + &&getu_1234_9234, /* 32h ^> 32h */ + &&getu_1234_4321, /* 32s -> 32h */ + &&getu_1234_C321, /* 32s ^> 32h */ }; #endif -#ifdef GET_END +#ifdef GETU_END while (0) { -get_1_1: sample = as_u8(src); goto GET_END; -get_1_9: sample = as_u8(src) ^ 0x80; goto GET_END; -get_12_12: sample = as_u16(src); goto GET_END; -get_12_92: sample = as_u16(src) ^ 0x8000; goto GET_END; -get_12_21: sample = bswap_16(as_u16(src)); goto GET_END; -get_12_A1: sample = bswap_16(as_u16(src) ^ 0x80); goto GET_END; -get_0123_0123: sample = as_u32(src); goto GET_END; -get_0123_0923: sample = (as_u32(src) ^ 0x800000); goto GET_END; -get_1230_0321: sample = bswap_32(as_u32(src)); goto GET_END; -get_1230_0B21: sample = bswap_32(as_u32(src) ^ 0x8000); goto GET_END; -get_1234_1234: sample = as_u32(src); goto GET_END; -get_1234_9234: sample = as_u32(src) ^ 0x80000000; goto GET_END; -get_1234_4321: sample = bswap_32(as_u32(src)); goto GET_END; -get_1234_C321: sample = bswap_32(as_u32(src) ^ 0x80); goto GET_END; +getu_1_1: sample = as_u8(src); goto GETU_END; +getu_1_9: sample = as_u8(src) ^ 0x80; goto GETU_END; +getu_12_12: sample = as_u16(src); goto GETU_END; +getu_12_92: sample = as_u16(src) ^ 0x8000; goto GETU_END; +getu_12_21: sample = bswap_16(as_u16(src)); goto GETU_END; +getu_12_A1: sample = bswap_16(as_u16(src) ^ 0x80); goto GETU_END; +getu_0123_0123: sample = as_u32(src); goto GETU_END; +getu_0123_0923: sample = (as_u32(src) ^ 0x800000); goto GETU_END; +getu_1230_0321: sample = bswap_32(as_u32(src)); goto GETU_END; +getu_1230_0B21: sample = bswap_32(as_u32(src) ^ 0x8000); goto GETU_END; +getu_1234_1234: sample = as_u32(src); goto GETU_END; +getu_1234_9234: sample = as_u32(src) ^ 0x80000000; goto GETU_END; +getu_1234_4321: sample = bswap_32(as_u32(src)); goto GETU_END; +getu_1234_C321: sample = bswap_32(as_u32(src) ^ 0x80); goto GETU_END; } #endif -- 2.47.1