Update of /cvsroot/playerstage/code/player/server/drivers/blackboard/localbb
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25517/server/drivers/blackboard/localbb
Modified Files:
Makefile.am localbb.cpp test.cpp
Log Message:
fix for peek behaviour in pull mode
updates for the blackboard interface
Index: Makefile.am
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blackboard/localbb/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 20 Sep 2007 02:50:46 -0000 1.1
--- Makefile.am 26 Nov 2007 22:14:59 -0000 1.2
***************
*** 9,12 ****
liblocalbb_la_SOURCES = localbb.cpp
! dnl test_SOURCES = test.cpp
! dnl test_LDADD = liblocalbb.la
$(top_srcdir)/client_libs/libplayerc/.libs/libplayerc.la
--- 9,12 ----
liblocalbb_la_SOURCES = localbb.cpp
! #test_SOURCES = test.cpp
! #test_LDADD = liblocalbb.la
$(top_srcdir)/client_libs/libplayerc/.libs/libplayerc.la
Index: test.cpp
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blackboard/localbb/test.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test.cpp 20 Sep 2007 02:50:46 -0000 1.1
--- test.cpp 26 Nov 2007 22:14:59 -0000 1.2
***************
*** 36,40 ****
void Read();
bool Shutdown();
!
private:
playerc_client_t* client_first;
--- 36,40 ----
void Read();
bool Shutdown();
!
private:
playerc_client_t* client_first;
***************
*** 58,62 ****
return false;
}
!
client_second = playerc_client_create(NULL, "localhost", 6665);
if (0 != playerc_client_connect(client_second))
--- 58,63 ----
return false;
}
! //playerc_client_datamode(client_first, PLAYERC_DATAMODE_PULL);
!
client_second = playerc_client_create(NULL, "localhost", 6665);
if (0 != playerc_client_connect(client_second))
***************
*** 65,68 ****
--- 66,71 ----
return false;
}
+ //playerc_client_datamode(client_second, PLAYERC_DATAMODE_PULL);
+
return true;
}
***************
*** 78,82 ****
first->on_blackboard_event = On_First_Device_Event;
return true;
!
}
--- 81,85 ----
first->on_blackboard_event = On_First_Device_Event;
return true;
!
}
***************
*** 118,122 ****
memset(t, 0, sizeof(t));
const char* key = strdup(KEY);
! if (playerc_blackboard_subscribe_to_key(first, key, t))
{
printf("Error subscribing to key '%s'\n", KEY);
--- 121,125 ----
memset(t, 0, sizeof(t));
const char* key = strdup(KEY);
! if (playerc_blackboard_subscribe_to_key(first, key, &t))
{
printf("Error subscribing to key '%s'\n", KEY);
***************
*** 143,147 ****
player_blackboard_entry_t *t = new player_blackboard_entry_t;
memset(t, 0, sizeof(t));
! if (playerc_blackboard_subscribe_to_key(second, KEY, t))
{
printf("Error subscribing to key '%s'\n", KEY);
--- 146,150 ----
player_blackboard_entry_t *t = new player_blackboard_entry_t;
memset(t, 0, sizeof(t));
! if (playerc_blackboard_subscribe_to_key(second, KEY, &t))
{
printf("Error subscribing to key '%s'\n", KEY);
***************
*** 152,156 ****
{
printf("Key '%s' does not exist (EMPTY)\n", KEY);
! } else
{
printf("First subscribed to key '%s'\n", KEY);
--- 155,160 ----
{
printf("Key '%s' does not exist (EMPTY)\n", KEY);
! }
! else
{
printf("First subscribed to key '%s'\n", KEY);
***************
*** 253,257 ****
}
playerc_blackboard_destroy(second);
!
return true;
}
--- 257,261 ----
}
playerc_blackboard_destroy(second);
!
return true;
}
***************
*** 277,281 ****
printf("Initialise\n");
bool res = t.Initialise();
!
if (res)
{
--- 281,285 ----
printf("Initialise\n");
bool res = t.Initialise();
!
if (res)
{
Index: localbb.cpp
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blackboard/localbb/localbb.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** localbb.cpp 20 Sep 2007 02:50:46 -0000 1.1
--- localbb.cpp 26 Nov 2007 22:14:59 -0000 1.2
***************
*** 365,369 ****
{
listeners[key].push_back(resp_queue);
! return entries[key];
}
--- 365,374 ----
{
listeners[key].push_back(resp_queue);
! BlackBoardEntry entry = entries[key];
! if (entry.key == "")
! {
! entry.key = key;
! }
! return entry;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
