[Playerstage-commit] code/player/client_libs/libplayerc dev_blackboard.c, 1.8, 1.9 playerc.h, 1.248, 1.249

[Toby C. <th...@us...>]

Update of /cvsroot/playerstage/code/player/client_libs/libplayerc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv869/client_libs/libplayerc

Modified Files:
	dev_blackboard.c playerc.h 
Log Message:
changed blackboard structure to have a group 


Index: playerc.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/playerc.h,v
retrieving revision 1.248
retrieving revision 1.249
diff -C2 -d -r1.248 -r1.249
*** playerc.h	22 Jan 2008 20:03:29 -0000	1.248
--- playerc.h	30 Jan 2008 02:06:45 -0000	1.249
***************
*** 1154,1170 ****
  /** @brief Subscribe to a key. If entry is none null it will be filled in with the response. The caller is
   * responsible for freeing it. */
! int playerc_blackboard_subscribe_to_key(playerc_blackboard_t *device, const char* key, player_blackboard_entry_t** entry);
  
  /** @brief Unsubscribe from a key. */
! int playerc_blackboard_unsubscribe_from_key(playerc_blackboard_t *device, const char* key);
  
  /** @brief Set an entry value. */
  int playerc_blackboard_set_entry(playerc_blackboard_t *device, player_blackboard_entry_t* entry);
  
! int playerc_blackboard_set_string(playerc_blackboard_t *device, const char* key, const char* value);
  
! int playerc_blackboard_set_int(playerc_blackboard_t *device, const char* key, const int value);
  
! int playerc_blackboard_set_double(playerc_blackboard_t *device, const char* key, const double value);
  
  /** @} */
--- 1154,1170 ----
  /** @brief Subscribe to a key. If entry is none null it will be filled in with the response. The caller is
   * responsible for freeing it. */
! int playerc_blackboard_subscribe_to_key(playerc_blackboard_t *device, const char* key, int32_t group_id, player_blackboard_entry_t** entry);
  
  /** @brief Unsubscribe from a key. */
! int playerc_blackboard_unsubscribe_from_key(playerc_blackboard_t *device, const char* key, int32_t group_id);
  
  /** @brief Set an entry value. */
  int playerc_blackboard_set_entry(playerc_blackboard_t *device, player_blackboard_entry_t* entry);
  
! int playerc_blackboard_set_string(playerc_blackboard_t *device, const char* key, uint32_t group_id, const char* value);
  
! int playerc_blackboard_set_int(playerc_blackboard_t *device, const char* key, uint32_t group_id, const int value);
  
! int playerc_blackboard_set_double(playerc_blackboard_t *device, const char* key, uint32_t group_id, const double value);
  
  /** @} */

Index: dev_blackboard.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_blackboard.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dev_blackboard.c	22 Jan 2008 20:03:29 -0000	1.8
--- dev_blackboard.c	30 Jan 2008 02:06:45 -0000	1.9
***************
*** 54,60 ****
  #include <sys/time.h>
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_string(const char* key, const char *str);
! player_blackboard_entry_t *playerc_pack_blackboard_entry_int(const char* key, const int i);
! player_blackboard_entry_t *playerc_pack_blackboard_entry_double(const char* key, const double d);
  
  char *playerc_unpack_blackboard_entry_string(const player_blackboard_entry_t *entry);
--- 54,60 ----
  #include <sys/time.h>
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_string(const char* key, uint32_t group_id, const char *str);
! player_blackboard_entry_t *playerc_pack_blackboard_entry_int(const char* key, uint32_t group_id, const int i);
! player_blackboard_entry_t *playerc_pack_blackboard_entry_double(const char* key, uint32_t group_id, const double d);
  
  char *playerc_unpack_blackboard_entry_string(const player_blackboard_entry_t *entry);
***************
*** 66,70 ****
  int playerc_check_blackboard_entry_is_double(const player_blackboard_entry_t *entry);
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_string(const char* key, const char *str)
  {
    struct timeval tv;
--- 66,70 ----
  int playerc_check_blackboard_entry_is_double(const player_blackboard_entry_t *entry);
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_string(const char* key, uint32_t group_id, const char *str)
  {
    struct timeval tv;
***************
*** 75,78 ****
--- 75,79 ----
    entry->type = PLAYERC_BLACKBOARD_DATA_TYPE_COMPLEX;
    entry->subtype = PLAYERC_BLACKBOARD_DATA_SUBTYPE_STRING;
+   entry->group_id = group_id;
  
    entry->key_count = strlen(key) + 1;
***************
*** 91,95 ****
  }
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_int(const char* key, const int i)
  {
    struct timeval tv;
--- 92,96 ----
  }
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_int(const char* key, uint32_t group_id, const int i)
  {
    struct timeval tv;
***************
*** 100,103 ****
--- 101,105 ----
    entry->type = PLAYERC_BLACKBOARD_DATA_TYPE_SIMPLE;
    entry->subtype = PLAYERC_BLACKBOARD_DATA_SUBTYPE_INT;
+   entry->group_id = group_id;
  
    entry->key_count = strlen(key) + 1;
***************
*** 116,120 ****
  }
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_double(const char* key, const double d)
  {
    struct timeval tv;
--- 118,122 ----
  }
  
! player_blackboard_entry_t *playerc_pack_blackboard_entry_double(const char* key, uint32_t group_id, const double d)
  {
    struct timeval tv;
***************
*** 125,128 ****
--- 127,131 ----
    entry->type = PLAYERC_BLACKBOARD_DATA_TYPE_SIMPLE;
    entry->subtype = PLAYERC_BLACKBOARD_DATA_SUBTYPE_DOUBLE;
+   entry->group_id = group_id;
  
    entry->key_count = strlen(key) + 1;
***************
*** 244,248 ****
  
  // Subscribe to a blackboard key
! int playerc_blackboard_subscribe_to_key(playerc_blackboard_t* device, const char* key, player_blackboard_entry_t** entry_out)
  {
    player_blackboard_entry_t req;
--- 247,251 ----
  
  // Subscribe to a blackboard key
! int playerc_blackboard_subscribe_to_key(playerc_blackboard_t* device, const char* key, int32_t group_id, player_blackboard_entry_t** entry_out)
  {
    player_blackboard_entry_t req;
***************
*** 250,253 ****
--- 253,257 ----
    req.key = strdup(key);
    req.key_count = strlen(key) + 1;
+   req.group_id = group_id;
  
    if (playerc_client_request(device->info.client, &device->info, 
***************
*** 264,268 ****
  
  // Unsubscribe from a blackboard key
! int playerc_blackboard_unsubscribe_from_key(playerc_blackboard_t* device, const char* key)
  {
    player_blackboard_entry_t req;
--- 268,272 ----
  
  // Unsubscribe from a blackboard key
! int playerc_blackboard_unsubscribe_from_key(playerc_blackboard_t* device, const char* key, int32_t group_id)
  {
    player_blackboard_entry_t req;
***************
*** 270,273 ****
--- 274,278 ----
    req.key = strdup(key);
    req.key_count = strlen(key) + 1;
+   req.group_id = group_id;
  
    if (playerc_client_request(device->info.client, &device->info, 
***************
*** 297,303 ****
  }
  
! int playerc_blackboard_set_string(playerc_blackboard_t *device, const char* key, const char* value)
  {
!   player_blackboard_entry_t *entry = playerc_pack_blackboard_entry_string(key, value);
    int result = playerc_blackboard_set_entry(device, entry);
    free(entry);
--- 302,308 ----
  }
  
! int playerc_blackboard_set_string(playerc_blackboard_t *device, const char* key, uint32_t group_id, const char* value)
  {
!   player_blackboard_entry_t *entry = playerc_pack_blackboard_entry_string(key, group_id, value);
    int result = playerc_blackboard_set_entry(device, entry);
    free(entry);
***************
*** 305,311 ****
  }
  
! int playerc_blackboard_set_int(playerc_blackboard_t *device, const char* key, const int value)
  {
!   player_blackboard_entry_t *entry = playerc_pack_blackboard_entry_int(key, value);
    int result = playerc_blackboard_set_entry(device, entry);
    free(entry);
--- 310,316 ----
  }
  
! int playerc_blackboard_set_int(playerc_blackboard_t *device, const char* key, uint32_t group_id, const int value)
  {
!   player_blackboard_entry_t *entry = playerc_pack_blackboard_entry_int(key, group_id, value);
    int result = playerc_blackboard_set_entry(device, entry);
    free(entry);
***************
*** 313,319 ****
  }
  
! int playerc_blackboard_set_double(playerc_blackboard_t *device, const char* key, const double value)
  {
!   player_blackboard_entry_t *entry = playerc_pack_blackboard_entry_double(key, value);
    int result = playerc_blackboard_set_entry(device, entry);
    free(entry);
--- 318,324 ----
  }
  
! int playerc_blackboard_set_double(playerc_blackboard_t *device, const char* key, uint32_t group_id, const double value)
  {
!   player_blackboard_entry_t *entry = playerc_pack_blackboard_entry_double(key, group_id, value);
    int result = playerc_blackboard_set_entry(device, entry);
    free(entry);