From: Toby C. <th...@us...> - 2008-01-22 12:03:27
|
Update of /cvsroot/playerstage/code/player/client_libs/libplayerc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9621/client_libs/libplayerc Modified Files: dev_blackboard.c playerc.h Log Message: more fixes for blackboard an dpython Index: playerc.h =================================================================== RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/playerc.h,v retrieving revision 1.247 retrieving revision 1.248 diff -C2 -d -r1.247 -r1.248 *** playerc.h 21 Jan 2008 02:58:45 -0000 1.247 --- playerc.h 22 Jan 2008 20:03:29 -0000 1.248 *************** *** 1130,1139 **** /** @brief BlackBoard proxy. */ ! typedef struct { /** Device info; must be at the start of all device structures. */ playerc_device_t info; /** Function to be called when a key is updated. */ ! void (*on_blackboard_event)(player_blackboard_entry_t); } playerc_blackboard_t; --- 1130,1141 ---- /** @brief BlackBoard proxy. */ ! typedef struct playerc_blackboard { /** Device info; must be at the start of all device structures. */ playerc_device_t info; /** Function to be called when a key is updated. */ ! void (*on_blackboard_event)(struct playerc_blackboard*, player_blackboard_entry_t); ! /** Kludge to get around python callback issues. */ ! void *py_private; } playerc_blackboard_t; Index: dev_blackboard.c =================================================================== RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_blackboard.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dev_blackboard.c 21 Jan 2008 02:58:45 -0000 1.7 --- dev_blackboard.c 22 Jan 2008 20:03:29 -0000 1.8 *************** *** 326,330 **** if (device->on_blackboard_event != NULL) { ! device->on_blackboard_event(*data); } } --- 326,330 ---- if (device->on_blackboard_event != NULL) { ! device->on_blackboard_event(device, *data); } } |