Browse Source

fix incompatible types warning in signal system

Palana 11 years ago
parent
commit
ec5cdf1b17
2 changed files with 7 additions and 7 deletions
  1. 4 4
      libobs/callback/signal.c
  2. 3 3
      libobs/callback/signal.h

+ 4 - 4
libobs/callback/signal.c

@@ -20,7 +20,7 @@
 #include "signal.h"
 #include "signal.h"
 
 
 struct signal_callback {
 struct signal_callback {
-	void (*callback)(calldata_t, void*);
+	signal_callback_t callback;
 	void *data;
 	void *data;
 };
 };
 
 
@@ -60,7 +60,7 @@ static inline void signal_info_destroy(struct signal_info *si)
 }
 }
 
 
 static inline size_t signal_get_callback_idx(struct signal_info *si,
 static inline size_t signal_get_callback_idx(struct signal_info *si,
-		void (*callback)(void*, calldata_t), void *data)
+		signal_callback_t callback, void *data)
 {
 {
 	for (size_t i = 0; i < si->callbacks.num; i++) {
 	for (size_t i = 0; i < si->callbacks.num; i++) {
 		struct signal_callback *sc = si->callbacks.array+i;
 		struct signal_callback *sc = si->callbacks.array+i;
@@ -129,7 +129,7 @@ void signal_handler_destroy(signal_handler_t handler)
 }
 }
 
 
 void signal_handler_connect(signal_handler_t handler, const char *signal,
 void signal_handler_connect(signal_handler_t handler, const char *signal,
-		void (*callback)(void*, calldata_t), void *data)
+		signal_callback_t callback, void *data)
 {
 {
 	struct signal_info *sig, *last;
 	struct signal_info *sig, *last;
 	struct signal_callback cb_data = {callback, data};
 	struct signal_callback cb_data = {callback, data};
@@ -174,7 +174,7 @@ static inline struct signal_info *getsignal_locked(signal_handler_t handler,
 }
 }
 
 
 void signal_handler_disconnect(signal_handler_t handler, const char *signal,
 void signal_handler_disconnect(signal_handler_t handler, const char *signal,
-		void (*callback)(void*, calldata_t), void *data)
+		signal_callback_t callback, void *data)
 {
 {
 	struct signal_info *sig = getsignal_locked(handler, signal);
 	struct signal_info *sig = getsignal_locked(handler, signal);
 	size_t idx;
 	size_t idx;

+ 3 - 3
libobs/callback/signal.h

@@ -33,15 +33,15 @@ extern "C" {
 
 
 struct signal_handler;
 struct signal_handler;
 typedef struct signal_handler *signal_handler_t;
 typedef struct signal_handler *signal_handler_t;
+typedef void (*signal_callback_t)(void*, calldata_t);
 
 
 EXPORT signal_handler_t signal_handler_create(void);
 EXPORT signal_handler_t signal_handler_create(void);
 EXPORT void signal_handler_destroy(signal_handler_t handler);
 EXPORT void signal_handler_destroy(signal_handler_t handler);
 
 
 EXPORT void signal_handler_connect(signal_handler_t handler, const char *signal,
 EXPORT void signal_handler_connect(signal_handler_t handler, const char *signal,
-		void (*callback)(void*, calldata_t), void *data);
+		signal_callback_t callback, void *data);
 EXPORT void signal_handler_disconnect(signal_handler_t handler,
 EXPORT void signal_handler_disconnect(signal_handler_t handler,
-		const char *signal, void (*callback)(void*, calldata_t),
-		void *data);
+		const char *signal, signal_callback_t callback, void *data);
 
 
 EXPORT void signal_handler_signal(signal_handler_t handler, const char *signal,
 EXPORT void signal_handler_signal(signal_handler_t handler, const char *signal,
 		calldata_t params);
 		calldata_t params);