typesafe casts

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

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 5ab01cb4befcb73ad602fce4fd9c8fe3c45a43bf..150e4cb9c7e2fd5302d3bbb6e4032186ccaafa33 100644 (file)
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -667,7 +667,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
     switch ((pa_sink_message_t) code) {
         
         case PA_SINK_MESSAGE_ADD_INPUT: {
-            pa_sink_input *i = userdata;
+            pa_sink_input *i = PA_SINK_INPUT(userdata);
             pa_hashmap_put(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index), pa_sink_input_ref(i));
 
             /* Since the caller sleeps in pa_sink_input_put(), we can
@@ -690,7 +690,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
         }
 
         case PA_SINK_MESSAGE_REMOVE_INPUT: {
-            pa_sink_input *i = userdata;
+            pa_sink_input *i = PA_SINK_INPUT(userdata);
 
             /* Since the caller sleeps in pa_sink_input_disconnect(),
              * we can safely access data outside of thread_info even

diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index eaf1335e8169b2e8dd06736ba61a1147c87db796..241e1fb5fa627ed14ce1cdceeb102cb40d65e3fe 100644 (file)
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -390,13 +390,13 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
 
     switch ((pa_source_message_t) code) {
         case PA_SOURCE_MESSAGE_ADD_OUTPUT: {
-            pa_source_output *o = userdata;
+            pa_source_output *o = PA_SOURCE_OUTPUT(userdata);
             pa_hashmap_put(s->thread_info.outputs, PA_UINT32_TO_PTR(o->index), pa_source_output_ref(o));
             return 0;
         }
 
         case PA_SOURCE_MESSAGE_REMOVE_OUTPUT: {
-            pa_source_output *o = userdata;
+            pa_source_output *o = PA_SOURCE_OUTPUT(userdata);
             if (pa_hashmap_remove(s->thread_info.outputs, PA_UINT32_TO_PTR(o->index)))
                 pa_source_output_unref(o);