Changeset 5149:b7345c9daac1 in roaraudio

Timestamp:

10/15/11 15:24:11 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to list standards the client lib supports (not yet complet)

Files:

• include/libroar/caps.h (modified) (1 diff)
• libroar/caps.c (modified) (6 diffs)
• roarclients/roarctl.c (modified) (6 diffs)

include/libroar/caps.h

@@ -52 +52 @@
 };
 
+const struct roar_stds * libroar_libstds(void);
+
 int roar_caps_to_msg(struct roar_message * mes,  struct roar_caps    * caps, void ** data);
 int roar_caps_from_msg(struct roar_caps  * caps, struct roar_message * mes,  void  * data);

libroar/caps.c

@@ -36 +36 @@
 #include "libroar.h"
 
+const struct roar_stds * libroar_libstds(void) {
+ static const uint32_t std[] = {
+  ROAR_STD_MAKE(ROAR_STDV_ROARAUDIO, 0, 0)  // ra-msg-v0
+ };
+ static const struct roar_stds stds = {.stds_len = sizeof(std)/sizeof(*std), .stds = (uint32_t*)std};
+ return &stds;
+}
+
 int roar_caps_to_msg(struct roar_message * mes,  struct roar_caps    * caps, void ** data) {
  char * datap;
@@ -116 +124 @@
   flags = 0;
 
- if ( con == NULL )
-  return -1;
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( out != NULL )
@@ -211 +221 @@
  struct roar_stds * ret;
 
- if ( len == 0 )
+ if ( len == 0 ) {
+  roar_err_set(ROAR_ERROR_INVAL);
   return NULL;
+ }
 
  ret = roar_mm_malloc(sizeof(struct roar_stds));
@@ -235 +247 @@
 
 int roar_stds_free(struct roar_stds * stds) {
- if ( stds == NULL )
-  return -1;
+ if ( stds == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( stds->stds != NULL )
@@ -260 +274 @@
  int i;
 
+ if ( vendor == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
  for (i = 0; _libroar_std_vendors[i].name != NULL; i++)
   if ( !strcasecmp(_libroar_std_vendors[i].name, vendor) )
    return _libroar_std_vendors[i].vendor;
 
+ roar_err_set(ROAR_ERROR_NOENT);
  return -1;
 }
@@ -274 +294 @@
    return _libroar_std_vendors[i].name;
 
+ roar_err_set(ROAR_ERROR_NOENT);
  return NULL;
 }

roarclients/roarctl.c

@@ -66 +66 @@
         "  --verbose   -v          - Show verbose output\n"
         "  --list-aiprofiles       - Show audio info profiles and exit\n"
+        "  --list-libstandards     - Gets list of library (libroar) supported standards\n"
         "  --enum-servers          - Show a list of possible servers\n"
        );
@@ -128 +129 @@
         "\n"
         "  serverstandards         - Gets list of server supported standards\n"
+        "  libstandards            - Gets list of library (libroar) supported standards\n"
         "\n"
         "  listclients             - Gets Information about clients\n"
@@ -295 +297 @@
 }
 
-void server_standards (struct roar_connection * con) {
- struct roar_stds * stds;
+static void print_stds (const struct roar_stds * stds) {
  size_t i;
  int vendor, standard, version;
  char numbuf[2][8];
  const char * vendor_name;
-
- if ( roar_caps_stds(con, &stds, NULL, -1) == -1 ) {
-  fprintf(stderr, "Error: can not get server standards\n");
-  return;
- }
 
  for (i = 0; i < stds->stds_len; i++) {
@@ -327 +323 @@
   printf("Server standard       : %s-%i%s\n", vendor_name, standard, numbuf[1]);
  }
+}
+
+void server_standards (struct roar_connection * con) {
+ struct roar_stds * stds;
+
+ if ( roar_caps_stds(con, &stds, NULL, -1) == -1 ) {
+  fprintf(stderr, "Error: can not get server standards\n");
+  return;
+ }
+
+ print_stds(stds);
+
+ roar_stds_free(stds);
+}
+
+void lib_standards (void) {
+ print_stds(libroar_libstds());
 }
 
@@ -1083 +1096 @@
    list_aiprofiles();
    return 0;
+  } else if ( strcmp(k, "--list-libstandards") == 0 ) {
+   lib_standards();
+   return 0;
   } else if ( strcmp(k, "--enum-servers") == 0 ) {
    enum_servers();
@@ -1186 +1202 @@
   } else if ( !strcmp(k, "serverstandards") ) {
    server_standards(&con);
+  } else if ( !strcmp(k, "libstandards") ) {
+   lib_standards();
   } else if ( !strcmp(k, "listclients") ) {
    list_clients(&con);