Changeset 3076:71ec405258b7 in roaraudio


Ignore:
Timestamp:
01/07/10 19:20:06 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

small updates to SLP support, added +slp address schemata

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/roarslp.h

    r2016 r3076  
    4040#define ROAR_SLP_MAX_MATCHES       8 
    4141#define ROAR_SLP_MAX_URL_LEN       256 
    42 #define ROAR_SLP_URL_TYPE          "service:mixer.fellig:roar" 
    43 #define ROAR_SLP_URL_TYPE_LEN      25 
     42#define ROAR_SLP_URL_TYPE_ROAR     "service:mixer.fellig:roar" 
     43#define ROAR_SLP_URL_TYPE_ROAR_LEN 25 
     44#define ROAR_SLP_URL_TYPE_ESD      "service:mixer.fellig:esd" 
     45#define ROAR_SLP_URL_TYPE_ESD_LEN  24 
     46#define ROAR_SLP_URL_TYPE          ROAR_SLP_URL_TYPE_ROAR 
     47#define ROAR_SLP_URL_TYPE_LEN      ROAR_SLP_URL_TYPE_ESD_LEN 
    4448 
    4549#ifndef ROAR_HAVE_LIBSLP 
  • libroar/basic.c

    r2897 r3076  
    6767 } 
    6868#endif 
     69 
     70 if ( !strcasecmp(server, "+slp") ) { 
     71  server = roar_slp_find_roard(0); 
     72  if ( server == NULL ) { 
     73   return -1; 
     74  } 
     75 } 
    6976 
    7077 if ( server == NULL || *server == 0 ) { 
  • roard/roard.c

    r3041 r3076  
    740740  sn = sockname; 
    741741 
    742  snprintf(addr, sizeof(addr), ROAR_SLP_URL_TYPE "://%s", sn); 
     742 snprintf(addr, sizeof(addr), ROAR_SLP_URL_TYPE_ROAR "://%s", sn); 
    743743 
    744744 err = SLPOpen("en", SLP_FALSE, &hslp); 
Note: See TracChangeset for help on using the changeset viewer.