Changeset 5577:5d9bed8d3bc6 in roaraudio

Timestamp:

07/21/12 16:55:08 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

delay display of --list-proto until all plugins are loaded. Also indicate if protocol is a plugin based implementation

Location:

roard

Files:

• clients.c (modified) (3 diffs)
• roard.c (modified) (5 diffs)

roard/clients.c

@@ -1136 +1136 @@
 void print_protolist        (enum output_format format) {
  struct roard_proto_handle * p;
+ char flags[5] = "    ";
  char subsys[7] = "      ";
  const char * description;
@@ -1182 +1183 @@
    continue;
 
+  strncpy(flags, "    ", 4);
   strncpy(subsys, "      ", 6);
   description = "(none)";
+
+  if ( p->lhandle != NULL )
+   flags[0] = 'P';
 
   switch (p->type) {
@@ -1212 +1217 @@
   switch (format) {
    case FORMAT_NATIVE:
-     printf("  %-13s %s - %s\n", roar_proto2str(p->proto), subsys, description);
+     printf("  %-8s %s %s - %s\n", roar_proto2str(p->proto), flags, subsys, description);
     break;
    case FORMAT_WIKI:
-     printf("||%s || ||%s ||%s ||\n", roar_proto2str(p->proto), subsys, description);
+     printf("||%s ||%s ||%s ||%s ||\n", roar_proto2str(p->proto), flags, subsys, description);
     break;
    case FORMAT_CSV:
-     printf("%s,,%s,%s\n", roar_proto2str(p->proto), subsys, description);
+     printf("%s,%s,%s,%s\n", roar_proto2str(p->proto), flags, subsys, description);
     break;
   }

roard/roard.c

@@ -40 +40 @@
 
 #include "roard.h"
+
+enum metaaction {
+ MA_ACTION,
+ MA_LIST_PROTO
+};
 
 enum action {
@@ -1404 +1409 @@
 #endif
 #ifdef ROAR_HAVE_MAIN_ARGS
+ enum metaaction metaaction = MA_ACTION;
  enum action action = START;
  int i;
@@ -2195 +2201 @@
 
   } else if ( strcmp(k, "--list-proto") == 0 ) {
-   print_protolist(print_format);
-   return 0;
+   metaaction = MA_LIST_PROTO;
 
   } else if ( strcmp(k, "-t") == 0 || strcmp(k, "--tcp") == 0 ) {
@@ -2315 +2320 @@
 
 #ifdef ROAR_HAVE_MAIN_ARGS
+ if ( metaaction != MA_ACTION )
+  action = START;
+
  switch (action) {
   case START:
@@ -2450 +2458 @@
  }
 
+#ifdef ROAR_HAVE_MAIN_ARGS
+ // check meta action now as everything is set up.
+ switch (metaaction) {
+  case MA_ACTION: /* noop */; break;
+  case MA_LIST_PROTO:
+    print_protolist(print_format);
+    return 0;
+   break;
+ }
+#endif
+
  // we should handle this on microcontrollers, too.
 #if !defined(ROAR_TARGET_MICROCONTROLLER) && !defined(ROAR_TARGET_WIN32)