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

fix function pointer types in dynamic procedure handler

Browse Source
This commit is contained in:
Palana 2014-01-03 02:58:17 +01:00
parent e846d0395c
commit 7ca68a9d04
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/callback/proc.c
View File

@ -21,7 +21,7 @@
struct proc_info { struct proc_info {
char *name; char *name;
void *data; void *data;
void (*proc)(calldata_t, void*); proc_handler_proc_t proc;
}; };
static inline void proc_info_free(struct proc_info *pi) static inline void proc_info_free(struct proc_info *pi)
@ -52,7 +52,7 @@ void proc_handler_destroy(proc_handler_t handler)
} }
void proc_handler_add(proc_handler_t handler, const char *name, void proc_handler_add(proc_handler_t handler, const char *name,
void (*proc)(void*, calldata_t), void *data) proc_handler_proc_t proc, void *data)
{ {
struct proc_info pi = {bstrdup(name), data, proc}; struct proc_info pi = {bstrdup(name), data, proc};
da_push_back(handler->procs, &pi); da_push_back(handler->procs, &pi);

3
libobs/callback/proc.h
View File

@ -34,12 +34,13 @@ extern "C" {
struct proc_handler; struct proc_handler;
typedef struct proc_handler *proc_handler_t; typedef struct proc_handler *proc_handler_t;
typedef void (*proc_handler_proc_t)(void*, calldata_t);
EXPORT proc_handler_t proc_handler_create(void); EXPORT proc_handler_t proc_handler_create(void);
EXPORT void proc_handler_destroy(proc_handler_t handler); EXPORT void proc_handler_destroy(proc_handler_t handler);
EXPORT void proc_handler_add(proc_handler_t handler, const char *name, EXPORT void proc_handler_add(proc_handler_t handler, const char *name,
void (*proc)(void*, calldata_t), void *data); proc_handler_proc_t proc, void *data);
/** /**
* Calls a function in a procedure handler. Returns false if the named * Calls a function in a procedure handler. Returns false if the named