summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--add.c4
-rw-r--r--byteswap.c4
-rw-r--r--common.c4
-rw-r--r--converter.c10
-rw-r--r--format.c70
-rw-r--r--interleave.c4
-rw-r--r--oss.c2
-rw-r--r--resample.c4
-rw-r--r--sydney.h3
-rw-r--r--volscale.c4
-rw-r--r--zero.c4
11 files changed, 57 insertions, 56 deletions
diff --git a/add.c b/add.c
index 93c49fd..42c0758 100644
--- a/add.c
+++ b/add.c
@@ -42,14 +42,14 @@ static void add_f32(void *dst, size_t dstr, const void *src1, size_t sstr1, cons
add_func_t get_add_func(sa_pcm_format_t f) {
- static const add_func_t funcs[SA_PCM_FORMAT_MAX] = {
+ static const add_func_t funcs[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_U8] = add_u8,
[SA_PCM_FORMAT_S16_NE] = add_s16,
[SA_PCM_FORMAT_S32_NE] = add_s32,
[SA_PCM_FORMAT_FLOAT32_NE] = add_f32
};
- sa_assert(f < SA_PCM_FORMAT_MAX);
+ sa_assert(f < _SA_PCM_FORMAT_MAX);
return funcs[f];
}
diff --git a/byteswap.c b/byteswap.c
index 0c80b8d..addd572 100644
--- a/byteswap.c
+++ b/byteswap.c
@@ -43,14 +43,14 @@ static void byteswap32(void *_dst, size_t dstr, const void *_src, size_t sstr, s
byteswap_func_t get_byteswap_func(sa_pcm_format_t f) {
- static const byteswap_func_t funcs[SA_PCM_FORMAT_MAX] = {
+ static const byteswap_func_t funcs[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_S16_RE] = byteswap16,
[SA_PCM_FORMAT_S24_RE] = byteswap24,
[SA_PCM_FORMAT_S32_RE] = byteswap32,
[SA_PCM_FORMAT_FLOAT32_BE] = byteswap32,
};
- sa_assert(f < SA_PCM_FORMAT_MAX);
+ sa_assert(f < _SA_PCM_FORMAT_MAX);
return funcs[f];
}
diff --git a/common.c b/common.c
index 3b53e77..13f95b3 100644
--- a/common.c
+++ b/common.c
@@ -64,7 +64,7 @@ int sa_stream_create_pcm(
sa_return_val_if_fail(s, SA_ERROR_INVALID);
sa_return_val_if_fail(mode == SA_MODE_RDONLY || mode == SA_MODE_WRONLY || mode == SA_MODE_RDWR, SA_ERROR_INVALID);
- sa_return_val_if_fail(format < SA_PCM_FORMAT_MAX, SA_ERROR_INVALID);
+ sa_return_val_if_fail(format < _SA_PCM_FORMAT_MAX, SA_ERROR_INVALID);
sa_return_val_if_fail(rate > 0, SA_ERROR_INVALID);
sa_return_val_if_fail(nchannels > 0, SA_ERROR_INVALID);
@@ -723,7 +723,7 @@ size_t get_pcm_sample_size(sa_pcm_format_t f) {
case SA_PCM_FORMAT_FLOAT32_BE:
return 4;
- case SA_PCM_FORMAT_MAX:
+ case _SA_PCM_FORMAT_MAX:
;
}
diff --git a/converter.c b/converter.c
index b33aafc..f8e0d15 100644
--- a/converter.c
+++ b/converter.c
@@ -59,7 +59,7 @@ static sa_pcm_format_t byteswap_fix(sa_pcm_format_t f) {
case SA_PCM_FORMAT_FLOAT32_RE:
return SA_PCM_FORMAT_FLOAT32_NE;
- case SA_PCM_FORMAT_MAX:
+ case _SA_PCM_FORMAT_MAX:
;
}
@@ -93,7 +93,7 @@ static sa_pcm_format_t get_work_format(sa_pcm_format_t a, sa_pcm_format_t b) {
case SA_PCM_FORMAT_FLOAT32_BE:
return SA_PCM_FORMAT_FLOAT32_NE;
- case SA_PCM_FORMAT_MAX:
+ case _SA_PCM_FORMAT_MAX:
;
}
@@ -120,7 +120,7 @@ static sa_pcm_format_t get_work_format(sa_pcm_format_t a, sa_pcm_format_t b) {
case SA_PCM_FORMAT_FLOAT32_BE:
return SA_PCM_FORMAT_FLOAT32_NE;
- case SA_PCM_FORMAT_MAX:
+ case _SA_PCM_FORMAT_MAX:
;
}
break;
@@ -146,7 +146,7 @@ static sa_pcm_format_t get_work_format(sa_pcm_format_t a, sa_pcm_format_t b) {
case SA_PCM_FORMAT_FLOAT32_BE:
return SA_PCM_FORMAT_FLOAT32_NE;
- case SA_PCM_FORMAT_MAX:
+ case _SA_PCM_FORMAT_MAX:
;
}
break;
@@ -155,7 +155,7 @@ static sa_pcm_format_t get_work_format(sa_pcm_format_t a, sa_pcm_format_t b) {
case SA_PCM_FORMAT_FLOAT32_BE:
return SA_PCM_FORMAT_FLOAT32_NE;
- case SA_PCM_FORMAT_MAX:
+ case _SA_PCM_FORMAT_MAX:
;
}
diff --git a/format.c b/format.c
index 91b7464..9b1f805 100644
--- a/format.c
+++ b/format.c
@@ -394,45 +394,45 @@ format_func_t get_format_func(sa_pcm_format_t from, sa_pcm_format_t to) {
* 3. only for NE types
*/
- static const format_func_t funcs[SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_MAX] = {
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_U8 + SA_PCM_FORMAT_S16_NE ] = format_u8_to_s16, /* done */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_U8 + SA_PCM_FORMAT_S32_NE ] = format_u8_to_s32, /* done */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_U8 + SA_PCM_FORMAT_FLOAT32_NE] = format_u8_to_f32, /* done */
-
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ULAW + SA_PCM_FORMAT_S16_NE ] = format_ulaw_to_s16, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ULAW + SA_PCM_FORMAT_S32_NE ] = format_ulaw_to_s32, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ULAW + SA_PCM_FORMAT_FLOAT32_NE] = format_ulaw_to_f32, /* done, no liboil */
-
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ALAW + SA_PCM_FORMAT_S16_NE ] = format_alaw_to_s16, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ALAW + SA_PCM_FORMAT_S32_NE ] = format_alaw_to_s32, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ALAW + SA_PCM_FORMAT_FLOAT32_NE] = format_alaw_to_f32, /* done, no liboil */
-
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_U8 ] = format_s16_to_u8, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_ULAW ] = format_s16_to_ulaw, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_ALAW ] = format_s16_to_alaw, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_S32_NE ] = format_s16_to_s32, /* done */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_FLOAT32_NE] = format_s16_to_f32, /* done */
+ static const format_func_t funcs[_SA_PCM_FORMAT_MAX * _SA_PCM_FORMAT_MAX] = {
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_U8 + SA_PCM_FORMAT_S16_NE ] = format_u8_to_s16, /* done */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_U8 + SA_PCM_FORMAT_S32_NE ] = format_u8_to_s32, /* done */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_U8 + SA_PCM_FORMAT_FLOAT32_NE] = format_u8_to_f32, /* done */
+
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ULAW + SA_PCM_FORMAT_S16_NE ] = format_ulaw_to_s16, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ULAW + SA_PCM_FORMAT_S32_NE ] = format_ulaw_to_s32, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ULAW + SA_PCM_FORMAT_FLOAT32_NE] = format_ulaw_to_f32, /* done, no liboil */
+
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ALAW + SA_PCM_FORMAT_S16_NE ] = format_alaw_to_s16, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ALAW + SA_PCM_FORMAT_S32_NE ] = format_alaw_to_s32, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_ALAW + SA_PCM_FORMAT_FLOAT32_NE] = format_alaw_to_f32, /* done, no liboil */
+
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_U8 ] = format_s16_to_u8, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_ULAW ] = format_s16_to_ulaw, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_ALAW ] = format_s16_to_alaw, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_S32_NE ] = format_s16_to_s32, /* done */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S16_NE + SA_PCM_FORMAT_FLOAT32_NE] = format_s16_to_f32, /* done */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S24_NE + SA_PCM_FORMAT_S32_NE ] = format_s24_to_s32, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S24_NE + SA_PCM_FORMAT_FLOAT32_NE] = format_s24_to_f32, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S24_NE + SA_PCM_FORMAT_S32_NE ] = format_s24_to_s32, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S24_NE + SA_PCM_FORMAT_FLOAT32_NE] = format_s24_to_f32, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_U8 ] = format_s32_to_u8, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_ULAW ] = format_s32_to_ulaw, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_ALAW ] = format_s32_to_alaw, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_S16_NE ] = format_s32_to_s16, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_S24_NE ] = format_s32_to_s24, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_FLOAT32_NE] = format_s32_to_f32, /* done, but suboptimal */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_U8 ] = format_s32_to_u8, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_ULAW ] = format_s32_to_ulaw, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_ALAW ] = format_s32_to_alaw, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_S16_NE ] = format_s32_to_s16, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_S24_NE ] = format_s32_to_s24, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_S32_NE + SA_PCM_FORMAT_FLOAT32_NE] = format_s32_to_f32, /* done, but suboptimal */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_U8 ] = format_f32_to_u8, /* done */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_ULAW ] = format_f32_to_ulaw, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_ALAW ] = format_f32_to_alaw, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_S16_NE ] = format_f32_to_s16, /* done */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_S24_NE ] = format_f32_to_s24, /* done, no liboil */
- [SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_S32_NE ] = format_f32_to_s32, /* done, but suboptimal */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_U8 ] = format_f32_to_u8, /* done */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_ULAW ] = format_f32_to_ulaw, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_ALAW ] = format_f32_to_alaw, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_S16_NE ] = format_f32_to_s16, /* done */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_S24_NE ] = format_f32_to_s24, /* done, no liboil */
+ [_SA_PCM_FORMAT_MAX * SA_PCM_FORMAT_FLOAT32_NE + SA_PCM_FORMAT_S32_NE ] = format_f32_to_s32, /* done, but suboptimal */
};
- sa_assert(from < SA_PCM_FORMAT_MAX);
- sa_assert(to < SA_PCM_FORMAT_MAX);
+ sa_assert(from < _SA_PCM_FORMAT_MAX);
+ sa_assert(to < _SA_PCM_FORMAT_MAX);
- return funcs[from * SA_PCM_FORMAT_MAX + to];
+ return funcs[from * _SA_PCM_FORMAT_MAX + to];
}
diff --git a/interleave.c b/interleave.c
index e503671..499d988 100644
--- a/interleave.c
+++ b/interleave.c
@@ -43,7 +43,7 @@ static void interleave32(void *_dst, size_t dstr, const void *_src, size_t sstr,
interleave_func_t get_interleave_func(sa_pcm_format_t f) {
- static const interleave_func_t funcs[SA_PCM_FORMAT_MAX] = {
+ static const interleave_func_t funcs[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_U8] = interleave8,
[SA_PCM_FORMAT_ULAW] = interleave8,
[SA_PCM_FORMAT_ALAW] = interleave8,
@@ -57,7 +57,7 @@ interleave_func_t get_interleave_func(sa_pcm_format_t f) {
[SA_PCM_FORMAT_FLOAT32_BE] = interleave32,
};
- sa_assert(f < SA_PCM_FORMAT_MAX);
+ sa_assert(f < _SA_PCM_FORMAT_MAX);
return funcs[f];
}
diff --git a/oss.c b/oss.c
index 6cae5a4..fc1d540 100644
--- a/oss.c
+++ b/oss.c
@@ -31,7 +31,7 @@ int driver_open(sa_stream_t *s) {
int f, arg, bs, r, phase, i, found, suggested;
unsigned c;
- static const int format_map[SA_PCM_FORMAT_MAX] = {
+ static const int format_map[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_U8] = AFMT_U8,
[SA_PCM_FORMAT_ULAW] = AFMT_MU_LAW,
[SA_PCM_FORMAT_ALAW] = AFMT_A_LAW,
diff --git a/resample.c b/resample.c
index 292f891..2061541 100644
--- a/resample.c
+++ b/resample.c
@@ -31,12 +31,12 @@ static void resample_f32(SpeexResamplerState *speex, unsigned channel, void *dst
resample_func_t get_resample_func(sa_pcm_format_t f) {
- static const resample_func_t funcs[SA_PCM_FORMAT_MAX] = {
+ static const resample_func_t funcs[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_S16_NE] = resample_s16,
[SA_PCM_FORMAT_FLOAT32_NE] = resample_f32
};
- sa_assert(f < SA_PCM_FORMAT_MAX);
+ sa_assert(f < _SA_PCM_FORMAT_MAX);
return funcs[f];
}
diff --git a/sydney.h b/sydney.h
index 1f53784..041e479 100644
--- a/sydney.h
+++ b/sydney.h
@@ -37,6 +37,7 @@ typedef enum {
SA_SEEK_RELATIVE,
SA_SEEK_ABSOLUTE,
SA_SEEK_RELATIVE_END,
+ _SA_SEEK_MAX
} sa_seek_t;
/** Supported formats */
@@ -52,7 +53,7 @@ typedef enum {
SA_PCM_FORMAT_S32_BE,
SA_PCM_FORMAT_FLOAT32_LE,
SA_PCM_FORMAT_FLOAT32_BE,
- SA_PCM_FORMAT_MAX
+ _SA_PCM_FORMAT_MAX
} sa_pcm_format_t;
/* Native/reverse endianness definitions for PCM */
diff --git a/volscale.c b/volscale.c
index 302c7ca..fe26700 100644
--- a/volscale.c
+++ b/volscale.c
@@ -54,14 +54,14 @@ static void volscale_f32(void *_dst, size_t dstr, const void *_src, size_t sstr,
volscale_func_t get_volscale_func(sa_pcm_format_t f) {
- static const volscale_func_t funcs[SA_PCM_FORMAT_MAX] = {
+ static const volscale_func_t funcs[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_U8] = volscale_u8,
[SA_PCM_FORMAT_S16_NE] = volscale_s16,
[SA_PCM_FORMAT_S32_NE] = volscale_s32,
[SA_PCM_FORMAT_FLOAT32_NE] = volscale_f32
};
- sa_assert(f < SA_PCM_FORMAT_MAX);
+ sa_assert(f < _SA_PCM_FORMAT_MAX);
return funcs[f];
}
diff --git a/zero.c b/zero.c
index b2b20be..9a5c9d5 100644
--- a/zero.c
+++ b/zero.c
@@ -40,14 +40,14 @@ static void zero_32(void *dst, size_t dstr, size_t bytes) {
zero_func_t get_zero_func(sa_pcm_format_t f) {
- static const zero_func_t funcs[SA_PCM_FORMAT_MAX] = {
+ static const zero_func_t funcs[_SA_PCM_FORMAT_MAX] = {
[SA_PCM_FORMAT_U8] = zero_u8,
[SA_PCM_FORMAT_S16_NE] = zero_16,
[SA_PCM_FORMAT_S32_NE] = zero_32,
[SA_PCM_FORMAT_FLOAT32_NE] = zero_32
};
- sa_assert(f < SA_PCM_FORMAT_MAX);
+ sa_assert(f < _SA_PCM_FORMAT_MAX);
return funcs[f];
}