[pulseaudio-commits] r1658 - in /branches/lennart/src: modules/oss-util.c pulsecore/protocol-native.c pulsecore/sink.c tests/asyncq-test.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Mon Aug 13 02:15:55 2007
New Revision: 1658

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1658&root=3Dpulseaudio&vi=
ew=3Drev
Log:
a couple of build fixes

Modified:
    branches/lennart/src/modules/oss-util.c
    branches/lennart/src/pulsecore/protocol-native.c
    branches/lennart/src/pulsecore/sink.c
    branches/lennart/src/tests/asyncq-test.c

Modified: branches/lennart/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/os=
s-util.c?rev=3D1658&root=3Dpulseaudio&r1=3D1657&r2=3D1658&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/oss-util.c (original)
+++ branches/lennart/src/modules/oss-util.c Mon Aug 13 02:15:55 2007
@@ -268,7 +268,7 @@
     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;

Modified: branches/lennart/src/pulsecore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
protocol-native.c?rev=3D1658&root=3Dpulseaudio&r1=3D1657&r2=3D1658&view=3Dd=
iff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/protocol-native.c (original)
+++ branches/lennart/src/pulsecore/protocol-native.c Mon Aug 13 02:15:55 20=
07
@@ -590,14 +590,14 @@
         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 @@
 =

     pa_memblock_unref(silence);
 =

-    *maxlength =3D pa_memblockq_get_maxlength(s->memblockq);
-    *tlength =3D pa_memblockq_get_tlength(s->memblockq);
-    *prebuf =3D pa_memblockq_get_prebuf(s->memblockq);
-    *minreq =3D pa_memblockq_get_minreq(s->memblockq);
-    *missing =3D pa_memblockq_missing(s->memblockq);
+    *maxlength =3D (uint32_t) pa_memblockq_get_maxlength(s->memblockq);
+    *tlength =3D (uint32_t) pa_memblockq_get_tlength(s->memblockq);
+    *prebuf =3D (uint32_t) pa_memblockq_get_prebuf(s->memblockq);
+    *minreq =3D (uint32_t) pa_memblockq_get_minreq(s->memblockq);
+    *missing =3D (uint32_t) pa_memblockq_missing(s->memblockq);
     =

     pa_atomic_store(&s->missing, 0);
     s->last_missing =3D *missing;

Modified: branches/lennart/src/pulsecore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
sink.c?rev=3D1658&root=3Dpulseaudio&r1=3D1657&r2=3D1658&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/sink.c (original)
+++ branches/lennart/src/pulsecore/sink.c Mon Aug 13 02:15:55 2007
@@ -738,7 +738,7 @@
                 =

                 volume_is_norm =3D pa_cvolume_is_norm(&info->sink_input->t=
hread_info.volume);
 =

-                pa_log_debug("Buffering l%u bytes ...", (unsigned long) in=
fo->buffer_bytes);
+                pa_log_debug("Buffering %lu bytes ...", (unsigned long) in=
fo->buffer_bytes);
                 =

                 while (info->buffer_bytes > 0) {
                     pa_memchunk memchunk;

Modified: branches/lennart/src/tests/asyncq-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/tests/asyn=
cq-test.c?rev=3D1658&root=3Dpulseaudio&r1=3D1657&r2=3D1658&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/tests/asyncq-test.c (original)
+++ branches/lennart/src/tests/asyncq-test.c Mon Aug 13 02:15:55 2007
@@ -41,10 +41,10 @@
 =

     for (i =3D 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 @@
     for (i =3D 0;; i++) {
         p =3D pa_asyncq_pop(q, 1);
 =

-        if (p =3D=3D (void*) -1)
+        if (p =3D=3D PA_UINT_TO_PTR(-1))
             break;
 =

-        pa_assert(p =3D=3D (void *) (i+1));
+        pa_assert(p =3D=3D PA_UINT_TO_PTR(i+1));
 =

         printf("popped %i\n", i);
     }