jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incompatible types warning in signal system

Browse Source
This commit is contained in:
Palana 2014-01-01 03:33:16 +01:00
parent 3c581d7fa2
commit ec5cdf1b17
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/callback/signal.c
View File

@ -20,7 +20,7 @@
#include "signal.h"
struct signal_callback {
void (*callback)(calldata_t, void*);
signal_callback_t callback;
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,
void (*callback)(void*, calldata_t), void *data)
signal_callback_t callback, void *data)
{
for (size_t i = 0; i < si->callbacks.num; 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 (*callback)(void*, calldata_t), void *data)
signal_callback_t callback, void *data)
{
struct signal_info *sig, *last;
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 (*callback)(void*, calldata_t), void *data)
signal_callback_t callback, void *data)
{
struct signal_info *sig = getsignal_locked(handler, signal);
size_t idx;

6
libobs/callback/signal.h
View File

@ -33,15 +33,15 @@ extern "C" {
struct signal_handler;
typedef struct signal_handler *signal_handler_t;
typedef void (*signal_callback_t)(void*, calldata_t);
EXPORT signal_handler_t signal_handler_create(void);
EXPORT void signal_handler_destroy(signal_handler_t handler);
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,
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,
calldata_t params);