[Playerstage-commit] SF.net SVN: playerstage: [6359] code/player/branches/cmake

[<gb...@us...>]

Revision: 6359
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6359&view=rev
Author:   gbiggs
Date:     2008-04-18 00:54:24 -0700 (Fri, 18 Apr 2008)

Log Message:
-----------
Merging changes 4467:4470 from trunk

Modified Paths:
--------------
    code/player/branches/cmake/CMake_Todo.txt
    code/player/branches/cmake/client_libs/libplayerc++/playerc++.h
    code/player/branches/cmake/client_libs/libplayerc++/playerclient.h
    code/player/branches/cmake/libplayercore/driver.cc
    code/player/branches/cmake/libplayercore/driver.h

Modified: code/player/branches/cmake/CMake_Todo.txt
===================================================================
--- code/player/branches/cmake/CMake_Todo.txt	2008-04-18 07:51:55 UTC (rev 6358)
+++ code/player/branches/cmake/CMake_Todo.txt	2008-04-18 07:54:24 UTC (rev 6359)
@@ -6,7 +6,7 @@
 . cross-compiling... does it work? - better support in CMake v2.6, apparently
 . examples dir (probably easy) - just need to do the make files for compiling outside the source tree now (old ones will still work, but cmake ones would be nicer)
 - dist tarballs, packages, etc - add in the extra_dist files to the source one, make the debian one
-. Fix the checks for boost threads and boost signals libraries - possibly a better version of FindBoost is coming in 2.6, defer till then (http://www.cmake.org/Bug/view.php?id=6257)
+. Fix the checks for boost threads and boost signals libraries (including check for boost::bind) - possibly a better version of FindBoost is coming in 2.6, defer till then (http://www.cmake.org/Bug/view.php?id=6257)
 - Some installable cmake modules with macros for making plugin drivers, etc
 - Clean out/replace any stragglers from autotools (including README and co)
 - Drivers being disabled by a check used to correctly force their option to off. Figure out why this broke. Fix it.

Modified: code/player/branches/cmake/client_libs/libplayerc++/playerc++.h
===================================================================
--- code/player/branches/cmake/client_libs/libplayerc++/playerc++.h	2008-04-18 07:51:55 UTC (rev 6358)
+++ code/player/branches/cmake/client_libs/libplayerc++/playerc++.h	2008-04-18 07:54:24 UTC (rev 6359)
@@ -61,6 +61,8 @@
 #include "libplayerc++/clientproxy.h"
 #include "libplayercore/interface_util.h"
 
+// Don't think we need to include these here
+/*
 #ifdef HAVE_BOOST_SIGNALS
   #include <boost/signal.hpp>
   #include <boost/bind.hpp>
@@ -71,6 +73,7 @@
   #include <boost/thread/thread.hpp>
   #include <boost/thread/xtime.hpp>
 #endif
+*/
 
 namespace PlayerCc
 {

Modified: code/player/branches/cmake/client_libs/libplayerc++/playerclient.h
===================================================================
--- code/player/branches/cmake/client_libs/libplayerc++/playerclient.h	2008-04-18 07:51:55 UTC (rev 6358)
+++ code/player/branches/cmake/client_libs/libplayerc++/playerclient.h	2008-04-18 07:54:24 UTC (rev 6359)
@@ -51,13 +51,13 @@
 
 #ifdef HAVE_BOOST_SIGNALS
   #include <boost/signal.hpp>
-  #include <boost/bind.hpp>
 #endif
 
 #ifdef HAVE_BOOST_THREAD
   #include <boost/thread/mutex.hpp>
   #include <boost/thread/thread.hpp>
   #include <boost/thread/xtime.hpp>
+  #include <boost/bind.hpp>
 #else
   // we have to define this so we don't have to
   // comment out all the instances of scoped_lock

Modified: code/player/branches/cmake/libplayercore/driver.cc
===================================================================
--- code/player/branches/cmake/libplayercore/driver.cc	2008-04-18 07:51:55 UTC (rev 6358)
+++ code/player/branches/cmake/libplayercore/driver.cc	2008-04-18 07:54:24 UTC (rev 6359)
@@ -130,6 +130,22 @@
   return 0;
 }
 
+int
+Driver::AddInterface(player_devaddr_t *addr, ConfigFile * cf, int section, int code, char * key)
+{
+  assert(addr);
+  // Create position interface
+  if (cf->ReadDeviceAddr(addr, section,"provides", code, -1, key) != 0)
+  {
+    if (key)
+      PLAYER_ERROR2("Could not load interface address. %s:*:*:%s:*",key,interf_to_str(code));
+    else
+      PLAYER_ERROR1("Could not load interface address. %s:*",interf_to_str(code));
+    return -1;
+  }
+  return this->AddInterface(*addr);
+}
+
 void
 Driver::Publish(QueuePointer &queue,
                 player_msghdr_t* hdr,

Modified: code/player/branches/cmake/libplayercore/driver.h
===================================================================
--- code/player/branches/cmake/libplayercore/driver.h	2008-04-18 07:51:55 UTC (rev 6358)
+++ code/player/branches/cmake/libplayercore/driver.h	2008-04-18 07:54:24 UTC (rev 6359)
@@ -137,6 +137,16 @@
     @returns 0 on success, non-zero otherwise. */
     int AddInterface(player_devaddr_t addr);
 
+    /** @brief Add an interface.
+
+    This form loads the address details from the config file and then adds the interface.
+
+    @param addr Pointer to Player device address, this is filled in with the address details.
+
+    @returns 0 on success, non-zero otherwise. */
+    int AddInterface(player_devaddr_t *addr, ConfigFile * cf, int section, int code, char * key = NULL);
+
+    
     /** @brief Set/reset error code */
     void SetError(int code) {this->error = code;}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.