Revision: 9059
http://playerstage.svn.sourceforge.net/playerstage/?rev=9059&view=rev
Author: jpgr87
Date: 2011-06-20 01:18:23 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Updated playersd to player 3.1, compiles again
Modified Paths:
--------------
code/player/trunk/examples/libplayerc/service_discovery.c
code/player/trunk/libplayersd/CMakeLists.txt
code/player/trunk/libplayersd/playersd.c
code/player/trunk/libplayersd/playersd.h
code/player/trunk/libplayersd/playersd_mdns.c
code/player/trunk/utils/pmap/CMakeLists.txt
Modified: code/player/trunk/examples/libplayerc/service_discovery.c
===================================================================
--- code/player/trunk/examples/libplayerc/service_discovery.c 2011-06-12
02:02:18 UTC (rev 9058)
+++ code/player/trunk/examples/libplayerc/service_discovery.c 2011-06-20
01:18:23 UTC (rev 9059)
@@ -31,9 +31,9 @@
#include <sys/time.h>
#include <libplayersd/playersd.h>
-#include <libplayercore/error.h>
-#include <libplayercore/addr_util.h>
-#include <libplayercore/interface_util.h>
+#include <libplayercommon/error.h>
+#include <libplayerinterface/addr_util.h>
+#include <libplayerinterface/interface_util.h>
#include <libplayerc/playerc.h>
#define MAX_DEVS 16
Modified: code/player/trunk/libplayersd/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayersd/CMakeLists.txt 2011-06-12 02:02:18 UTC
(rev 9058)
+++ code/player/trunk/libplayersd/CMakeLists.txt 2011-06-20 01:18:23 UTC
(rev 9059)
@@ -1,17 +1,18 @@
IF (HAVE_DNS_SD)
- OPTION (HAVE_PLAYERSD "Build libplayersd" OFF)
+ OPTION (BUILD_PLAYERSD "Build libplayersd" OFF)
ENDIF (HAVE_DNS_SD)
-IF (HAVE_PLAYERSD)
+IF (BUILD_PLAYERSD)
+ SET(HAVE_PLAYERSD true)
SET (playersdSrcs playersd_mdns.c playersd.c)
PLAYER_ADD_LIBRARY (playersd ${playersdSrcs})
TARGET_LINK_LIBRARIES (playersd playerinterface playercommon)
- PLAYER_ADD_LINK_LIB (dns_sd)
+ TARGET_LINK_LIBRARIES(playersd dns_sd)
IF (PTHREAD_LIB)
SET (PTHREAD_LIB_FLAG "-l${PTHREAD_LIB}")
ENDIF (PTHREAD_LIB)
PLAYER_MAKE_PKGCONFIG ("playersd" "Player service discovery library - part
of the Player Project" "playerinterface playercommon" "" "" "-ldns_sd
${PTHREAD_LIB_FLAG}")
PLAYER_INSTALL_HEADERS (playersd playersd.h)
-ENDIF (HAVE_PLAYERSD)
+ENDIF (BUILD_PLAYERSD)
Modified: code/player/trunk/libplayersd/playersd.c
===================================================================
--- code/player/trunk/libplayersd/playersd.c 2011-06-12 02:02:18 UTC (rev
9058)
+++ code/player/trunk/libplayersd/playersd.c 2011-06-20 01:18:23 UTC (rev
9059)
@@ -51,8 +51,8 @@
#include <assert.h>
#include <stdio.h>
-#include <libplayercore/addr_util.h>
-#include <libplayercore/interface_util.h>
+#include <libplayerinterface/addr_util.h>
+#include <libplayerinterface/interface_util.h>
#include "playersd.h"
#define PLAYER_SD_DEVS_LEN_INITIAL 4
Modified: code/player/trunk/libplayersd/playersd.h
===================================================================
--- code/player/trunk/libplayersd/playersd.h 2011-06-12 02:02:18 UTC (rev
9058)
+++ code/player/trunk/libplayersd/playersd.h 2011-06-20 01:18:23 UTC (rev
9059)
@@ -64,7 +64,7 @@
#include <libplayerinterface/player.h>
-#define PLAYER_SD_SERVICENAME "_player21._tcp"
+#define PLAYER_SD_SERVICENAME "_player31._tcp"
#define PLAYER_SD_DEVICE_TXTNAME "device"
#define PLAYER_SD_NAME_MAXLEN 256
#define PLAYER_SD_TXT_MAXLEN 256
Modified: code/player/trunk/libplayersd/playersd_mdns.c
===================================================================
--- code/player/trunk/libplayersd/playersd_mdns.c 2011-06-12 02:02:18 UTC
(rev 9058)
+++ code/player/trunk/libplayersd/playersd_mdns.c 2011-06-20 01:18:23 UTC
(rev 9059)
@@ -59,9 +59,9 @@
#include <dns_sd.h>
-#include <libplayercore/error.h>
-#include <libplayercore/interface_util.h>
-#include <libplayercore/addr_util.h>
+#include <libplayercommon/error.h>
+#include <libplayerinterface/interface_util.h>
+#include <libplayerinterface/addr_util.h>
#include <replace/replace.h> // for poll(2)
Modified: code/player/trunk/utils/pmap/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/pmap/CMakeLists.txt 2011-06-12 02:02:18 UTC (rev
9058)
+++ code/player/trunk/utils/pmap/CMakeLists.txt 2011-06-20 01:18:23 UTC (rev
9059)
@@ -52,6 +52,9 @@
PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
TARGET_LINK_LIBRARIES (lodo playercore)
+ IF(HAVE_PLAYERSD)
+ TARGET_LINK_LIBRARIES(lodo playersd)
+ ENDIF(HAVE_PLAYERSD)
IF (GLUT_FOUND)
TARGET_LINK_LIBRARIES (lodo ${OPENGL_LIBRARIES}
${GLUT_LIBRARIES})
ENDIF (GLUT_FOUND)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
