mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

a couple of build fixes

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1658 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-13 00:15:55 +00:00
parent 1d5e9f0205
commit 8a663d4cda
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/oss-util.c
View file

@ -268,7 +268,7 @@ static int pa_oss_get_volume(int fd, int mixer, const pa_sample_spec *ss, pa_cvo
return 0; return 0;
} }
static int pa_oss_set_volume(int fd, int mixer, const pa_sample_spec *ss, const pa_cvolume *volume) { static int pa_oss_set_volume(int fd, long mixer, const pa_sample_spec *ss, const pa_cvolume *volume) {
char cv[PA_CVOLUME_SNPRINT_MAX]; char cv[PA_CVOLUME_SNPRINT_MAX];
unsigned vol; unsigned vol;
pa_volume_t l, r; pa_volume_t l, r;

20
src/pulsecore/protocol-native.c
View file

@ -590,14 +590,14 @@ static playback_stream* playback_stream_new(
const pa_sample_spec *ss, const pa_sample_spec *ss,
const pa_channel_map *map, const pa_channel_map *map,
const char *name, const char *name,
size_t *maxlength, uint32_t *maxlength,
size_t *tlength, uint32_t *tlength,
size_t *prebuf, uint32_t *prebuf,
size_t *minreq, uint32_t *minreq,
pa_cvolume *volume, pa_cvolume *volume,
uint32_t syncid, uint32_t syncid,
int corked, int corked,
size_t *missing) { uint32_t *missing) {
playback_stream *s, *ssync; playback_stream *s, *ssync;
pa_sink_input *sink_input; pa_sink_input *sink_input;
@ -674,11 +674,11 @@ static playback_stream* playback_stream_new(
pa_memblock_unref(silence); pa_memblock_unref(silence);
*maxlength = pa_memblockq_get_maxlength(s->memblockq); *maxlength = (uint32_t) pa_memblockq_get_maxlength(s->memblockq);
*tlength = pa_memblockq_get_tlength(s->memblockq); *tlength = (uint32_t) pa_memblockq_get_tlength(s->memblockq);
*prebuf = pa_memblockq_get_prebuf(s->memblockq); *prebuf = (uint32_t) pa_memblockq_get_prebuf(s->memblockq);
*minreq = pa_memblockq_get_minreq(s->memblockq); *minreq = (uint32_t) pa_memblockq_get_minreq(s->memblockq);
*missing = pa_memblockq_missing(s->memblockq); *missing = (uint32_t) pa_memblockq_missing(s->memblockq);
pa_atomic_store(&s->missing, 0); pa_atomic_store(&s->missing, 0);
s->last_missing = *missing; s->last_missing = *missing;

2
src/pulsecore/sink.c
View file

@ -738,7 +738,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
volume_is_norm = pa_cvolume_is_norm(&info->sink_input->thread_info.volume); volume_is_norm = pa_cvolume_is_norm(&info->sink_input->thread_info.volume);
pa_log_debug("Buffering l%u bytes ...", (unsigned long) info->buffer_bytes); pa_log_debug("Buffering %lu bytes ...", (unsigned long) info->buffer_bytes);
while (info->buffer_bytes > 0) { while (info->buffer_bytes > 0) {
pa_memchunk memchunk; pa_memchunk memchunk;

8
src/tests/asyncq-test.c
View file

@ -41,10 +41,10 @@ static void producer(void *_q) {
for (i = 0; i < 1000; i++) { for (i = 0; i < 1000; i++) {
printf("pushing %i\n", i); printf("pushing %i\n", i);
pa_asyncq_push(q, (void*) (i+1), 1); pa_asyncq_push(q, PA_UINT_TO_PTR(i+1), 1);
} }
pa_asyncq_push(q, (void*) -1, 1); pa_asyncq_push(q, PA_UINT_TO_PTR(-1), 1);
printf("pushed end\n"); printf("pushed end\n");
} }
@ -58,10 +58,10 @@ static void consumer(void *_q) {
for (i = 0;; i++) { for (i = 0;; i++) {
p = pa_asyncq_pop(q, 1); p = pa_asyncq_pop(q, 1);
if (p == (void*) -1) if (p == PA_UINT_TO_PTR(-1))
break; break;
pa_assert(p == (void *) (i+1)); pa_assert(p == PA_UINT_TO_PTR(i+1));
printf("popped %i\n", i); printf("popped %i\n", i);
} }