* 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

diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 672365887c48b8b35c9ed7411ca28f9bbde82d04..3ecca7457ec3d393b6efbff42e89b62cd06507f5 100644 (file)
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -94,7 +94,7 @@ static void command_stream_killed(pa_pdispatch *pd, uint32_t command, uint32_t t
 static void command_request(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 #endif
 
-static const pa_pdispatch_callback command_table[PA_COMMAND_MAX] = {
+static const pa_pdispatch_callback_t command_table[PA_COMMAND_MAX] = {
 #ifdef TUNNEL_SINK
     [PA_COMMAND_REQUEST] = command_request,
 #endif    

diff --git a/src/polyp/context.c b/src/polyp/context.c
index eac5dd231a09a1f59703a679893a5b9dc8e0dab2..e2d9d33d20d1a068624f5b882c00ec0287d5dd3f 100644 (file)
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -72,7 +72,7 @@
 
 #define AUTOSPAWN_LOCK "autospawn.lock"
 
-static const pa_pdispatch_callback command_table[PA_COMMAND_MAX] = {
+static const pa_pdispatch_callback_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_REQUEST] = pa_command_request,
     [PA_COMMAND_OVERFLOW] = pa_command_overflow_or_underflow,
     [PA_COMMAND_UNDERFLOW] = pa_command_overflow_or_underflow,
@@ -671,7 +671,7 @@ int pa_context_errno(pa_context *c) {
     return c->error;
 }
 
-void pa_context_set_state_callback(pa_context *c, void (*cb)(pa_context *c, void *userdata), void *userdata) {
+void pa_context_set_state_callback(pa_context *c, pa_context_notify_cb_t cb, void *userdata) {
     assert(c && c->ref >= 1);
     c->state_callback = cb;
     c->state_userdata = userdata;
@@ -730,7 +730,7 @@ static void set_dispatch_callbacks(pa_operation *o) {
     pa_operation_unref(o);
 }
 
-pa_operation* pa_context_drain(pa_context *c, void (*cb) (pa_context*c, void *userdata), void *userdata) {
+pa_operation* pa_context_drain(pa_context *c, pa_context_notify_cb_t cb, void *userdata) {
     pa_operation *o;
     assert(c && c->ref >= 1);
 
@@ -777,7 +777,7 @@ void pa_context_simple_ack_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_U
     }
 
     if (o->callback) {
-        void (*cb)(pa_context *c, int _success, void *_userdata) = (void (*)(pa_context *c, int _success, void *_userdata)) o->callback;
+        pa_context_success_cb_t cb = (pa_context_success_cb_t) o->callback;
         cb(o->context, success, o->userdata);
     }
 
@@ -805,7 +805,7 @@ pa_operation* pa_context_send_simple_command(pa_context *c, uint32_t command, vo
     return pa_operation_ref(o);
 }
 
-pa_operation* pa_context_set_default_sink(pa_context *c, const char *name, void(*cb)(pa_context*c, int success, void *userdata), void *userdata) {
+pa_operation* pa_context_set_default_sink(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata) {
     pa_tagstruct *t;
     pa_operation *o;
     uint32_t tag;
@@ -825,7 +825,7 @@ pa_operation* pa_context_set_default_sink(pa_context *c, const char *name, void(
     return pa_operation_ref(o);
 }
 
-pa_operation* pa_context_set_default_source(pa_context *c, const char *name, void(*cb)(pa_context*c, int success,  void *userdata), void *userdata) {
+pa_operation* pa_context_set_default_source(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata) {
     pa_tagstruct *t;
     pa_operation *o;
     uint32_t tag;
@@ -850,7 +850,7 @@ int pa_context_is_local(pa_context *c) {
     return c->local;
 }
 
-pa_operation* pa_context_set_name(pa_context *c, const char *name, void(*cb)(pa_context*c, int success,  void *userdata), void *userdata) {
+pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata) {
     pa_tagstruct *t;
     pa_operation *o;
     uint32_t tag;

diff --git a/src/polyp/context.h b/src/polyp/context.h
index 4efd515641dfb0757ffe91e16a95cecdf922e4de..1c06c4342f1cd42dbf536850b71cb7e81b58364f 100644 (file)
--- a/src/polyp/context.h
+++ b/src/polyp/context.h
@@ -53,6 +53,12 @@ PA_C_DECL_BEGIN
  * An opaque connection context to a daemon */
 typedef struct pa_context pa_context;
 
+/** Generic notification callback prototype */
+typedef void (*pa_context_notify_cb_t)(pa_context *c, void *userdata);
+
+/** A generic callback for operation completion */
+typedef void (*pa_context_success_cb_t) (pa_context *c, int success, void *userdata);
+
 /** Instantiate a new connection context with an abstract mainloop API
  * and an application name */
 pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name);
@@ -63,10 +69,8 @@ void pa_context_unref(pa_context *c);
 /** Increase the reference counter of the context by one */
 pa_context* pa_context_ref(pa_context *c);
 
-typedef void (*pa_context_state_callback)(pa_context *c, void *userdata);
-
 /** Set a callback function that is called whenever the context status changes */
-void pa_context_set_state_callback(pa_context *c, pa_context_state_callback callback, void *userdata);
+void pa_context_set_state_callback(pa_context *c, pa_context_notify_cb_t cb, void *userdata);
 
 /** Return the error number of the last failed operation */
 int pa_context_errno(pa_context *c);
@@ -90,7 +94,7 @@ int pa_context_connect(pa_context *c, const char *server, int spawn, const pa_sp
 void pa_context_disconnect(pa_context *c);
 
 /** Drain the context. If there is nothing to drain, the function returns NULL */
-pa_operation* pa_context_drain(pa_context *c, void (*cb) (pa_context*c, void *userdata), void *userdata);
+pa_operation* pa_context_drain(pa_context *c, pa_context_notify_cb_t cb, void *userdata);
 
 /** Tell the daemon to exit. No operation object is returned as the
  * connection is terminated when the daemon quits, thus this operation
@@ -98,16 +102,16 @@ pa_operation* pa_context_drain(pa_context *c, void (*cb) (pa_context*c, void *us
 void pa_context_exit_daemon(pa_context *c);
 
 /** Set the name of the default sink. \since 0.4 */
-pa_operation* pa_context_set_default_sink(pa_context *c, const char *name, void(*cb)(pa_context*c, int success, void *userdata), void *userdata);
+pa_operation* pa_context_set_default_sink(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata);
 
 /** Set the name of the default source. \since 0.4 */
-pa_operation* pa_context_set_default_source(pa_context *c, const char *name, void(*cb)(pa_context*c, int success,  void *userdata), void *userdata);
+pa_operation* pa_context_set_default_source(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata);
 
 /** Returns 1 when the connection is to a local daemon. Returns negative when no connection has been made yet. \since 0.5 */
 int pa_context_is_local(pa_context *c);
 
 /** Set a different application name for context on the server. \since 0.5 */
-pa_operation* pa_context_set_name(pa_context *c, const char *name, void(*cb)(pa_context*c, int success,  void *userdata), void *userdata);
+pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata);
 
 /** Return the server name this context is connected to. \since 0.7 */
 const char* pa_context_get_server(pa_context *c);

diff --git a/src/polyp/internal.h b/src/polyp/internal.h
index 578969ee416d0fe6f3bd61fded09ce933bb2fe49..f0374b67caa184520faabd0d699812abe841819a 100644 (file)
--- a/src/polyp/internal.h
+++ b/src/polyp/internal.h
@@ -59,8 +59,8 @@ struct pa_context {
     uint32_t csyncid;
     uint32_t error;
     pa_context_state_t state;
-    
-    void (*state_callback)(pa_context*c, void *userdata);
+
+    pa_context_notify_cb_t state_callback;
     void *state_userdata;
 
     void (*subscribe_callback)(pa_context *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata);

diff --git a/src/polypcore/pdispatch.c b/src/polypcore/pdispatch.c
index 7941e4a82d7b14c61e3ae3784db0306112960c7e..fbb1b6974e9f14837ac28d1cef09a4924fdc5656 100644 (file)
--- 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 57666259ca95683818b528405eeefd571fe08568..27d2d61f95dc0fb50ec19e6668e844a68a16172c 100644 (file)
--- 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 aaa4fc48a6b7b60c8c61093a91feeb39e02be087..21800e6c5077eccad3476a75d9465e53273b0431 100644 (file)
--- 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,