[polypaudio-commits] r611 - in /trunk/src: polypcore/idxset.c polypcore/protocol-esound.c polypcore/protocol-native.c tests/sync-playback.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Mon Feb 27 10:09:15 2006
New Revision: 611

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=611&root=polypaudio&view=rev
Log:
64-bit fixes.

Modified:
    trunk/src/polypcore/idxset.c
    trunk/src/polypcore/protocol-esound.c
    trunk/src/polypcore/protocol-native.c
    trunk/src/tests/sync-playback.c

Modified: trunk/src/polypcore/idxset.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/idxset.c?rev=611&root=polypaudio&r1=610&r2=611&view=diff
==============================================================================
--- trunk/src/polypcore/idxset.c (original)
+++ trunk/src/polypcore/idxset.c Mon Feb 27 10:09:15 2006
@@ -65,7 +65,7 @@
 }
 
 unsigned pa_idxset_trivial_hash_func(const void *p) {
-    return (unsigned) p;
+    return (unsigned) (long) p;
 }
 
 int pa_idxset_trivial_compare_func(const void *a, const void *b) {

Modified: trunk/src/polypcore/protocol-esound.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-esound.c?rev=611&root=polypaudio&r1=610&r2=611&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-esound.c (original)
+++ trunk/src/polypcore/protocol-esound.c Mon Feb 27 10:09:15 2006
@@ -476,7 +476,7 @@
     uint8_t *response;
     size_t t, k, s;
     struct connection *conn;
-    size_t idx = PA_IDXSET_INVALID;
+    uint32_t idx = PA_IDXSET_INVALID;
     unsigned nsamples;
     assert(c && data && length == sizeof(int));
     

Modified: trunk/src/polypcore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-native.c?rev=611&root=polypaudio&r1=610&r2=611&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-native.c (original)
+++ trunk/src/polypcore/protocol-native.c Mon Feb 27 10:09:15 2006
@@ -799,7 +799,7 @@
 static void command_create_record_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct record_stream *s;
-    size_t maxlength, fragment_size;
+    uint32_t maxlength, fragment_size;
     uint32_t source_index;
     const char *name, *source_name;
     pa_sample_spec ss;
@@ -1098,7 +1098,7 @@
 static void command_create_upload_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct upload_stream *s;
-    size_t length;
+    uint32_t length;
     const char *name;
     pa_sample_spec ss;
     pa_channel_map map;

Modified: trunk/src/tests/sync-playback.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/sync-playback.c?rev=611&root=polypaudio&r1=610&r2=611&view=diff
==============================================================================
--- trunk/src/tests/sync-playback.c (original)
+++ trunk/src/tests/sync-playback.c Mon Feb 27 10:09:15 2006
@@ -64,7 +64,7 @@
 static void nop_free_cb(void *p) {}
 
 static void underflow_cb(struct pa_stream *s, void *userdata) {
-    int i = (int) userdata;
+    int i = (int) (long) userdata;
 
     fprintf(stderr, "Stream %i finished\n", i);
     
@@ -86,7 +86,7 @@
 
         case PA_STREAM_READY: {
 
-            int r, i = (int) userdata;
+            int r, i = (int) (long) userdata;
 
             fprintf(stderr, "Writing data to stream %i.\n", i);
             
@@ -136,7 +136,7 @@
             
                 streams[i] = pa_stream_new(c, name, &sample_spec, NULL);
                 assert(streams[i]);
-                pa_stream_set_state_callback(streams[i], stream_state_callback, (void*) i);
+                pa_stream_set_state_callback(streams[i], stream_state_callback, (void*) (long) i);
                 pa_stream_connect_playback(streams[i], NULL, &buffer_attr, PA_STREAM_START_CORKED, NULL, i == 0 ? NULL : streams[0]);
             }