Changeset 2017:419fb879b9e3 in roaraudio

Timestamp:

06/19/09 16:25:43 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to annouce a location

Location:

roard

Files:

• include/roard.h (modified) (1 diff)
• roard.c (modified) (5 diffs)

roard/include/roard.h

@@ -124 +124 @@
   int                        mixer_channels;
  } streams[ROAR_DIR_DIRIDS];
+ char * location;
 } * g_config;
 

roard/roard.c

@@ -44 +44 @@
         " --setuid              - UserID to the audio user as specified via -U\n"
         " --sysclocksync        - calculate exact sample rate using the system clock\n"
+        " --location  LOC       - Set lion readable location of server\n"
        );
 
@@ -157 +158 @@
  g_config->streams[ROAR_DIR_MIDI_OUT].flags = ROAR_FLAG_SYNC;
 
+ g_config->location = "***default***";
+
  return 0;
 }
@@ -379 +382 @@
  char addr[1024];
  char attr[1024] = "";
+ char * location;
 
  if ( sockname != NULL )
@@ -393 +397 @@
 
  if (!unreg) {
+
+  if ( SLPEscape(g_config->location, &location, SLP_FALSE) != SLP_OK ) {
+   ROAR_ERR("Error using SLPEscape() on server location, really bad!");
+   SLPClose(hslp);
+   return -1;
+  }
+
   snprintf(attr, sizeof(attr), "(wave-rate=%i),(wave-channels=%i),(wave-bits=%i),"
-                               "(light-channels=%i)",
+                               "(light-channels=%i),(location=%s)",
            g_sa->rate, g_sa->channels, g_sa->bits,
-           g_light_state.channels
+           g_light_state.channels,
+           location
           );
 
@@ -631 +643 @@
    ROAR_ERR("--setuid not supported");
 #endif
+  } else if ( strcmp(k, "--location") == 0 ) {
+   g_config->location = argv[++i];
 
   } else if ( strcmp(k, "--list-cf") == 0 ) {