a couple of build fixes

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1658 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index 155d42e45ec25d3244b408917ae1551d6302c4e6..5a939cf85306618541feb30be7944cb51777a565 100644 (file)
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -268,7 +268,7 @@ static int pa_oss_get_volume(int fd, int mixer, const pa_sample_spec *ss, pa_cvo
     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];
     unsigned vol;
     pa_volume_t l, r;

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 1a112a8deb642a8ceb4d71f14bbf8e2237a8fc31..6b49efecbc655a29e95cdbf07026f2e7f6f5ef6b 100644 (file)
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -590,14 +590,14 @@ static playback_stream* playback_stream_new(
         const pa_sample_spec *ss,
         const pa_channel_map *map,
         const char *name,
-        size_t *maxlength,
-        size_t *tlength,
-        size_t *prebuf,
-        size_t *minreq,
+        uint32_t *maxlength,
+        uint32_t *tlength,
+        uint32_t *prebuf,
+        uint32_t *minreq,
         pa_cvolume *volume,
         uint32_t syncid,
         int corked,
-        size_t *missing) {
+        uint32_t *missing) {
 
     playback_stream *s, *ssync;
     pa_sink_input *sink_input;
@@ -674,11 +674,11 @@ static playback_stream* playback_stream_new(
 
     pa_memblock_unref(silence);
 
-    *maxlength = pa_memblockq_get_maxlength(s->memblockq);
-    *tlength = pa_memblockq_get_tlength(s->memblockq);
-    *prebuf = pa_memblockq_get_prebuf(s->memblockq);
-    *minreq = pa_memblockq_get_minreq(s->memblockq);
-    *missing = pa_memblockq_missing(s->memblockq);
+    *maxlength = (uint32_t) pa_memblockq_get_maxlength(s->memblockq);
+    *tlength = (uint32_t) pa_memblockq_get_tlength(s->memblockq);
+    *prebuf = (uint32_t) pa_memblockq_get_prebuf(s->memblockq);
+    *minreq = (uint32_t) pa_memblockq_get_minreq(s->memblockq);
+    *missing = (uint32_t) pa_memblockq_missing(s->memblockq);
     
     pa_atomic_store(&s->missing, 0);
     s->last_missing = *missing;

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index ced80381309081e82b7db1bb71415b31f33499d7..cfead9be2198bc81d9c9ba01782874170de4e7d7 100644 (file)
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -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);
 
-                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) {
                     pa_memchunk memchunk;

diff --git a/src/tests/asyncq-test.c b/src/tests/asyncq-test.c
index 2e4b66cc0da0f6d56a1a864c4654d815e9cd5072..09b20047116343b901f045057594373447aa911c 100644 (file)
--- a/src/tests/asyncq-test.c
+++ b/src/tests/asyncq-test.c
@@ -41,10 +41,10 @@ static void producer(void *_q) {
 
     for (i = 0; i < 1000; 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");
 }
 
@@ -58,10 +58,10 @@ static void consumer(void *_q) {
     for (i = 0;; i++) {
         p = pa_asyncq_pop(q, 1);
 
-        if (p == (void*) -1)
+        if (p == PA_UINT_TO_PTR(-1))
             break;
 
-        pa_assert(p == (void *) (i+1));
+        pa_assert(p == PA_UINT_TO_PTR(i+1));
 
         printf("popped %i\n", i);
     }