Changeset 4577:e9b3b3b521dd in roaraudio

Timestamp:

11/02/10 21:31:36 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Announce standards via OpenSLP (Closes: #5)

Files:

• ChangeLog (modified) (1 diff)
• roard/caps.c (modified) (1 diff)
• roard/include/caps.h (modified) (1 diff)
• roard/roard.c (modified) (3 diffs)

ChangeLog

@@ -1 +1 @@
 v. 0.4beta2 - ?
-
+        * Announce standards via OpenSLP (Closes: #5)
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

roard/caps.c

@@ -55 +55 @@
 };
 
+char * stds_string (void) {
+ size_t len = g_caps_stds.stds_len * 14;
+ char * ret = roar_mm_malloc(len);
+ size_t off = 0;
+ size_t i;
+ int snpret;
+ uint32_t cap;
+ int version;
+
+ if ( ret == NULL )
+  return NULL;
+
+ for (i = 0; i < g_caps_stds.stds_len; i++) {
+  cap = g_caps_stds.stds[i];
+  version = ROAR_STD_VERSION(cap);
+  if ( version == 0 ) {
+   snpret = snprintf(ret+off, len-off, "%i-%i,", ROAR_STD_VENDOR(cap), ROAR_STD_STD(cap));
+  } else {
+   snpret = snprintf(ret+off, len-off, "%i-%i-%i,", ROAR_STD_VENDOR(cap), ROAR_STD_STD(cap), version);
+  }
+  if ( snpret > 0 ) {
+   off += snpret;
+  } else {
+   roar_mm_free(ret);
+   return NULL;
+  }
+ }
+
+ ret[off-1] = 0;
+
+ return ret;
+}
+
 //ll

roard/include/caps.h

@@ -31 +31 @@
 struct roar_stds g_caps_stds;
 
+char * stds_string (void);
+
 #endif
 

roard/roard.c

@@ -1325 +1325 @@
  char * location;
  char * description;
+ char * standards;
 
  if ( sockname != NULL )
@@ -1352 +1353 @@
   }
 
+  standards = stds_string();
+
+  if ( standards == NULL ) {
+   if ( (standards = roar_mm_malloc(1)) == NULL ) {
+    SLPClose(hslp);
+    return -1;
+   }
+   standards[0] = 0;
+  }
+
   snprintf(attr, sizeof(attr), "(wave-rate=%i),(wave-channels=%i),(wave-bits=%i),"
 #ifndef ROAR_WITHOUT_DCOMP_LIGHT
                                "(light-channels=%i),"
 #endif
+                               "(standards=%s),"
                                "(location=%s),(description=%s)",
            g_sa->rate, g_sa->channels, g_sa->bits,
@@ -1361 +1373 @@
            g_light_state.channels,
 #endif
+           standards,
            location, description
           );
+
+  roar_mm_free(standards);
 
   /* Register a service with SLP */