diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-06-29 16:48:37 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-06-29 16:48:37 +0000 |
| commit | ef422fa4ae626e9638ca70d1c56f27e701dd69c2 (patch) | |
| tree | 1dd62aee8ec44f3d3c7d5f4bacb3d2b38769e5b3 /src/sample-util.c | |
| parent | a74cd2a1bd92eac6a4140d0794ac4b557be6c133 (diff) | |
esound protocol
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@40 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/sample-util.c')
| -rw-r--r-- | src/sample-util.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/sample-util.c b/src/sample-util.c index 7a3c267a..ff14548c 100644 --- a/src/sample-util.c +++ b/src/sample-util.c @@ -4,7 +4,7 @@ #include "sample-util.h" struct pa_sample_spec default_sample_spec = { - .format = SAMPLE_S16NE, + .format = PA_SAMPLE_S16NE, .rate = 44100, .channels = 2 }; @@ -27,18 +27,20 @@ void silence_memory(void *p, size_t length, struct pa_sample_spec *spec) { assert(p && length && spec); switch (spec->format) { - case SAMPLE_U8: + case PA_SAMPLE_U8: c = 127; break; - case SAMPLE_S16LE: - case SAMPLE_S16BE: - case SAMPLE_FLOAT32: + case PA_SAMPLE_S16LE: + case PA_SAMPLE_S16BE: + case PA_SAMPLE_FLOAT32: c = 0; break; - case SAMPLE_ALAW: - case SAMPLE_ULAW: + case PA_SAMPLE_ALAW: + case PA_SAMPLE_ULAW: c = 80; break; + default: + assert(0); } memset(p, c, length); @@ -47,7 +49,7 @@ void silence_memory(void *p, size_t length, struct pa_sample_spec *spec) { size_t mix_chunks(struct mix_info channels[], unsigned nchannels, void *data, size_t length, struct pa_sample_spec *spec, uint8_t volume) { unsigned c, d; assert(channels && data && length && spec); - assert(spec->format == SAMPLE_S16NE); + assert(spec->format == PA_SAMPLE_S16NE); for (d = 0;; d += sizeof(int16_t)) { int32_t sum = 0; |