Changeset 4306:fd0767a7f875 in roaraudio


Ignore:
Timestamp:
09/07/10 03:44:37 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

include core in callback functions so proxy callbacks can work nicely

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/notify.h

    r4305 r4306  
    6262#define roar_notify_core_free(x) roar_notify_core_unref((x)) 
    6363 
    64 struct roar_subscriber * roar_notify_core_subscribe(struct roar_notify_core * core, struct roar_event * event, void (*cb)(struct roar_event * event, void * userdata), void * userdata); 
     64struct roar_subscriber * roar_notify_core_subscribe(struct roar_notify_core * core, struct roar_event * event, void (*cb)(struct roar_notify_core * core, struct roar_event * event, void * userdata), void * userdata); 
    6565int roar_notify_core_unsubscribe(struct roar_notify_core * core, struct roar_subscriber * subscriber); 
    6666 
  • libroar/notify.c

    r4305 r4306  
    4242 int target; 
    4343 int target_type; 
    44  void (*cb)(struct roar_event * event, void * userdata); 
     44 void (*cb)(struct roar_notify_core * core, struct roar_event * event, void * userdata); 
    4545 void * userdata; 
    4646 size_t refc; 
     
    155155} 
    156156 
    157 struct roar_subscriber * roar_notify_core_subscribe(struct roar_notify_core * core, struct roar_event * event, void (*cb)(struct roar_event * event, void * userdata), void * userdata) { 
     157struct roar_subscriber * roar_notify_core_subscribe(struct roar_notify_core * core, struct roar_event * event, void (*cb)(struct roar_notify_core * core, struct roar_event * event, void * userdata), void * userdata) { 
    158158 struct roar_subscriber * subs = NULL; 
    159159 struct roar_subscriber * cur, * old; 
     
    243243   ROAR_ERR("roar_notify_core_emit(core=%p, event=%p): cur=%p, cb is set NULL, bad.", core, event, cur); 
    244244  } else { 
    245    cur->cb(event, cur->userdata); 
     245   cur->cb(core, event, cur->userdata); 
    246246  } 
    247247  cur = cur->next; 
Note: See TracChangeset for help on using the changeset viewer.