summaryrefslogtreecommitdiffstats
path: root/polyp/sample-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-01-11 01:17:39 +0000
committerLennart Poettering <lennart@poettering.net>2006-01-11 01:17:39 +0000
commit1f0961368f58a9fec319d86c79a86a9f0d008cf5 (patch)
treec712a897bb34ade3c03a06ba754264153ac3bc16 /polyp/sample-util.c
parent6c512fb5a3fdb578179be79672c5096de1a1d25b (diff)
* remove a lot of compiler warnings introduced by using some new GCC flags
* add typedefs for public structs and enums and drop the struct/enum prefixs from all uses where it makes sense git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@447 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/sample-util.c')
-rw-r--r--polyp/sample-util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/polyp/sample-util.c b/polyp/sample-util.c
index bf8be34e..cb5dd1c3 100644
--- a/polyp/sample-util.c
+++ b/polyp/sample-util.c
@@ -30,18 +30,18 @@
#include "sample-util.h"
-struct pa_memblock *pa_silence_memblock(struct pa_memblock* b, const struct pa_sample_spec *spec) {
+pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec) {
assert(b && b->data && spec);
pa_silence_memory(b->data, b->length, spec);
return b;
}
-void pa_silence_memchunk(struct pa_memchunk *c, const struct pa_sample_spec *spec) {
+void pa_silence_memchunk(pa_memchunk *c, const pa_sample_spec *spec) {
assert(c && c->memblock && c->memblock->data && spec && c->length);
pa_silence_memory((uint8_t*) c->memblock->data+c->index, c->length, spec);
}
-void pa_silence_memory(void *p, size_t length, const struct pa_sample_spec *spec) {
+void pa_silence_memory(void *p, size_t length, const pa_sample_spec *spec) {
uint8_t c = 0;
assert(p && length && spec);
@@ -65,7 +65,7 @@ void pa_silence_memory(void *p, size_t length, const struct pa_sample_spec *spec
memset(p, c, length);
}
-size_t pa_mix(struct pa_mix_info channels[], unsigned nchannels, void *data, size_t length, const struct pa_sample_spec *spec, pa_volume_t volume) {
+size_t pa_mix(pa_mix_info channels[], unsigned nchannels, void *data, size_t length, const pa_sample_spec *spec, pa_volume_t volume) {
assert(channels && data && length && spec);
if (spec->format == PA_SAMPLE_S16NE) {
@@ -161,7 +161,7 @@ size_t pa_mix(struct pa_mix_info channels[], unsigned nchannels, void *data, siz
size_t d;
for (d = 0;; d += sizeof(float)) {
- pa_volume_t sum = 0;
+ float sum = 0;
unsigned c;
if (d >= length)
@@ -203,7 +203,7 @@ size_t pa_mix(struct pa_mix_info channels[], unsigned nchannels, void *data, siz
}
-void pa_volume_memchunk(struct pa_memchunk*c, const struct pa_sample_spec *spec, pa_volume_t volume) {
+void pa_volume_memchunk(pa_memchunk*c, const pa_sample_spec *spec, pa_volume_t volume) {
assert(c && spec && (c->length % pa_frame_size(spec) == 0));
if (volume == PA_VOLUME_NORM)