From 4566d56e31c58211763ddbb4669c7f04152669d0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Feb 2006 16:01:53 +0000
Subject: * Make typdefs for the pa_context callback prototypes *
 s/pa_context_notify_cb/pa_context_notify_cb_t/g

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@521 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/polypcore/pdispatch.c       | 12 ++++++------
 src/polypcore/pdispatch.h       |  6 +++---
 src/polypcore/protocol-native.c |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/polypcore')

diff --git a/src/polypcore/pdispatch.c b/src/polypcore/pdispatch.c
index 7941e4a8..fbb1b697 100644
--- a/src/polypcore/pdispatch.c
+++ b/src/polypcore/pdispatch.c
@@ -94,7 +94,7 @@ static const char *command_names[PA_COMMAND_MAX] = {
 struct reply_info {
     pa_pdispatch *pdispatch;
     PA_LLIST_FIELDS(struct reply_info);
-    pa_pdispatch_callback callback;
+    pa_pdispatch_callback_t callback;
     void *userdata;
     uint32_t tag;
     pa_time_event *time_event;
@@ -103,7 +103,7 @@ struct reply_info {
 struct pa_pdispatch {
     int ref;
     pa_mainloop_api *mainloop;
-    const pa_pdispatch_callback *callback_table;
+    const pa_pdispatch_callback_t *callback_table;
     unsigned n_commands;
     PA_LLIST_HEAD(struct reply_info, replies);
     pa_pdispatch_drain_callback drain_callback;
@@ -121,7 +121,7 @@ static void reply_info_free(struct reply_info *r) {
     pa_xfree(r);
 }
 
-pa_pdispatch* pa_pdispatch_new(pa_mainloop_api *mainloop, const pa_pdispatch_callback*table, unsigned entries) {
+pa_pdispatch* pa_pdispatch_new(pa_mainloop_api *mainloop, const pa_pdispatch_callback_t*table, unsigned entries) {
     pa_pdispatch *pd;
     assert(mainloop);
 
@@ -149,7 +149,7 @@ static void pdispatch_free(pa_pdispatch *pd) {
 }
 
 static void run_action(pa_pdispatch *pd, struct reply_info *r, uint32_t command, pa_tagstruct *ts) {
-    pa_pdispatch_callback callback;
+    pa_pdispatch_callback_t callback;
     void *userdata;
     uint32_t tag;
     assert(r);
@@ -210,7 +210,7 @@ int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*packet, void *userdata) {
             run_action(pd, r, command, ts);
 
     } else if (pd->callback_table && (command < pd->n_commands) && pd->callback_table[command]) {
-        const pa_pdispatch_callback *c = pd->callback_table+command;
+        const pa_pdispatch_callback_t *c = pd->callback_table+command;
 
         (*c)(pd, command, tag, ts, userdata);
     } else {
@@ -236,7 +236,7 @@ static void timeout_callback(pa_mainloop_api*m, pa_time_event*e, PA_GCC_UNUSED c
     run_action(r->pdispatch, r, PA_COMMAND_TIMEOUT, NULL);
 }
 
-void pa_pdispatch_register_reply(pa_pdispatch *pd, uint32_t tag, int timeout, pa_pdispatch_callback cb, void *userdata) {
+void pa_pdispatch_register_reply(pa_pdispatch *pd, uint32_t tag, int timeout, pa_pdispatch_callback_t cb, void *userdata) {
     struct reply_info *r;
     struct timeval tv;
     assert(pd && pd->ref >= 1 && cb);
diff --git a/src/polypcore/pdispatch.h b/src/polypcore/pdispatch.h
index 57666259..27d2d61f 100644
--- a/src/polypcore/pdispatch.h
+++ b/src/polypcore/pdispatch.h
@@ -29,15 +29,15 @@
 
 typedef struct pa_pdispatch pa_pdispatch;
 
-typedef void (*pa_pdispatch_callback)(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+typedef void (*pa_pdispatch_callback_t)(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 
-pa_pdispatch* pa_pdispatch_new(pa_mainloop_api *m, const pa_pdispatch_callback*table, unsigned entries);
+pa_pdispatch* pa_pdispatch_new(pa_mainloop_api *m, const pa_pdispatch_callback_t*table, unsigned entries);
 void pa_pdispatch_unref(pa_pdispatch *pd);
 pa_pdispatch* pa_pdispatch_ref(pa_pdispatch *pd);
 
 int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*p, void *userdata);
 
-void pa_pdispatch_register_reply(pa_pdispatch *pd, uint32_t tag, int timeout, pa_pdispatch_callback callback, void *userdata);
+void pa_pdispatch_register_reply(pa_pdispatch *pd, uint32_t tag, int timeout, pa_pdispatch_callback_t callback, void *userdata);
 
 int pa_pdispatch_is_pending(pa_pdispatch *pd);
 
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index aaa4fc48..21800e6c 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -174,7 +174,7 @@ static void command_get_autoload_info_list(pa_pdispatch *pd, uint32_t command, u
 static void command_cork_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_flush_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 
-static const pa_pdispatch_callback command_table[PA_COMMAND_MAX] = {
+static const pa_pdispatch_callback_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_ERROR] = NULL,
     [PA_COMMAND_TIMEOUT] = NULL,
     [PA_COMMAND_REPLY] = NULL,
-- 
cgit