Changeset 3076:71ec405258b7 in roaraudio

Timestamp:

01/07/10 19:20:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

small updates to SLP support, added +slp address schemata

Files:

• include/libroar/roarslp.h (modified) (1 diff)
• libroar/basic.c (modified) (1 diff)
• roard/roard.c (modified) (1 diff)

include/libroar/roarslp.h

@@ -40 +40 @@
 #define ROAR_SLP_MAX_MATCHES       8
 #define ROAR_SLP_MAX_URL_LEN       256
-#define ROAR_SLP_URL_TYPE          "service:mixer.fellig:roar"
-#define ROAR_SLP_URL_TYPE_LEN      25
+#define ROAR_SLP_URL_TYPE_ROAR     "service:mixer.fellig:roar"
+#define ROAR_SLP_URL_TYPE_ROAR_LEN 25
+#define ROAR_SLP_URL_TYPE_ESD      "service:mixer.fellig:esd"
+#define ROAR_SLP_URL_TYPE_ESD_LEN  24
+#define ROAR_SLP_URL_TYPE          ROAR_SLP_URL_TYPE_ROAR
+#define ROAR_SLP_URL_TYPE_LEN      ROAR_SLP_URL_TYPE_ESD_LEN
 
 #ifndef ROAR_HAVE_LIBSLP

libroar/basic.c

@@ -67 +67 @@
  }
 #endif
+
+ if ( !strcasecmp(server, "+slp") ) {
+  server = roar_slp_find_roard(0);
+  if ( server == NULL ) {
+   return -1;
+  }
+ }
 
  if ( server == NULL || *server == 0 ) {

roard/roard.c

@@ -740 +740 @@
   sn = sockname;
 
- snprintf(addr, sizeof(addr), ROAR_SLP_URL_TYPE "://%s", sn);
+ snprintf(addr, sizeof(addr), ROAR_SLP_URL_TYPE_ROAR "://%s", sn);
 
  err = SLPOpen("en", SLP_FALSE, &hslp);