Changeset 2016:615c005ab476 in roaraudio

Timestamp:

06/16/09 15:03:24 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use symbolic constant

Files:

• include/libroar/roarslp.h (modified) (1 diff)
• libroar/slp.c (modified) (2 diffs)
• 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
 
 #ifndef ROAR_HAVE_LIBSLP

libroar/slp.c

@@ -172 +172 @@
   ROAR_DBG("roar_slp_find_roard_r(*) = ?");
 
-  if ( roar_slp_search(&cookie, "service:mixer.fellig:roar") == -1 )
+  if ( roar_slp_search(&cookie, ROAR_SLP_URL_TYPE) == -1 )
    return -1;
 
@@ -191 +191 @@
  }
 
- if ( !strncmp(url, "service:mixer.fellig:roar://", 28) )
+ if ( !strncmp(url, ROAR_SLP_URL_TYPE "://", ROAR_SLP_URL_TYPE_LEN + 3) )
   offset = 28;
 

roard/roard.c

@@ -383 +383 @@
   sn = sockname;
 
- snprintf(addr, sizeof(addr), "service:mixer.fellig:roar://%s", sn);
+ snprintf(addr, sizeof(addr), ROAR_SLP_URL_TYPE "://%s", sn);
 
  err = SLPOpen("en", SLP_FALSE, &hslp);