Changeset 5275:811818eb5b81 in roaraudio for roard/clients.c

Timestamp:

11/19/11 22:54:26 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved plugin loader a lot (Closes: #190)

File:

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

roard/clients.c

@@ -38 +38 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
 #ifdef ROAR_HAVE_H_ESD
- {ROAR_PROTO_ESOUND, NULL, emul_esd_check_client, NULL, NULL},
+ {ROAR_PROTO_ESOUND, ROAR_SUBSYS_WAVEFORM, "EsounD emulation", NULL, emul_esd_check_client, NULL, NULL},
 #endif
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
- {ROAR_PROTO_RPLAY, NULL, emul_rplay_check_client, NULL, NULL},
+ {ROAR_PROTO_RPLAY, ROAR_SUBSYS_WAVEFORM, "RPlay emulation", NULL, emul_rplay_check_client, NULL, NULL},
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
- {ROAR_PROTO_GOPHER, NULL, emul_gopher_check_client, NULL, emul_gopher_flushed_client},
-#endif
- {-1, NULL}
+ {ROAR_PROTO_GOPHER, ROAR_SUBSYS_WAVEFORM, "The Internet Gopher Protocol", NULL, emul_gopher_check_client, NULL, emul_gopher_flushed_client},
+#endif
+ {-1, 0, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -58 +58 @@
  for (i = 0; i < ROAR_CLIENTS_MAX; i++)
   g_clients[i] = NULL;
+
+ for (i = 0; g_proto[i].proto != -1; i++);
+
+ for (; i < MAX_PROTOS; i++)
+  g_proto[i].proto = -1;
 
  return 0;
@@ -826 +831 @@
  memcpy(&(g_proto[i]), proto, sizeof(*g_proto));
 
- i++;
-
- memset(&(g_proto[i]), 0, sizeof(*g_proto));
- g_proto[i].proto = -1;
-
- return 0;
-}
-
+ return 0;
+}
+
+int clients_unregister_proto(int proto) {
+ const size_t len = sizeof(g_proto)/sizeof(*g_proto);
+ size_t i;
+
+ if ( proto < 0 ) {
+  roar_err_set(ROAR_ERROR_RANGE);
+  return -1;
+ }
+
+ for (i = 0; i < len; i++) {
+  if ( g_proto[i].proto == proto ) {
+   memset(&(g_proto[i]), 0, sizeof(*g_proto));
+   g_proto[i].proto = -1;
+   return 0;
+  }
+ }
+
+ roar_err_set(ROAR_ERROR_NOENT);
+ return -1;
+}
+
+void print_protolist        (enum output_format format) {
+ const size_t len = sizeof(g_proto)/sizeof(*g_proto);
+ struct roard_proto * p;
+ char subsys[7] = "      ";
+ size_t i;
+
+ switch (format) {
+  case FORMAT_NATIVE:
+    printf("  Protocol Flag Subsys - Description\n");
+    printf("------------------------------------------------------\n");
+    printf("  roar          WM LRX - RoarAudio native protocol\n");
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
+    printf("  simple        WM LRX - PulseAudio simple protocol\n");
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+    printf("  rsound        W      - RSound emulation\n");
+#endif
+   break;
+  case FORMAT_WIKI:
+    printf("||=Protocol =||=Flag =||=Subsys =||=Description              =||\n");
+    printf("||roar       ||       ||WM LRX   ||RoarAudio native protocol  ||\n");
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
+    printf("||simple     ||       ||WM LRX   ||PulseAudio simple protocol ||\n");
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+    printf("||rsound     ||       ||W        ||RSound emulation           ||\n");
+#endif
+   break;
+  case FORMAT_CSV:
+    printf("Protocol,Flag,Subsys,Description\n");
+    printf("roar,,WM LRX,RoarAudio native protocol\n");
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
+    printf("simple,,WM LRX,PulseAudio simple protocol\n");
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+    printf("rsound,,W,RSound emulation\n");
+#endif
+   break;
+  default:
+    roar_err_set(ROAR_ERROR_NOTSUP);
+    return;
+ }
+
+ for (i = 0; i < len; i++) {
+  p = &(g_proto[i]);
+  if ( p->proto == -1 )
+   continue;
+
+  strncpy(subsys, "      ", 6);
+
+  if ( p->subsystems & ROAR_SUBSYS_WAVEFORM )
+   subsys[0] = 'W';
+  if ( p->subsystems & ROAR_SUBSYS_MIDI )
+   subsys[1] = 'M';
+  if ( p->subsystems & ROAR_SUBSYS_CB )
+   subsys[2] = 'C';
+  if ( p->subsystems & ROAR_SUBSYS_LIGHT )
+   subsys[3] = 'L';
+  if ( p->subsystems & ROAR_SUBSYS_RAW )
+   subsys[4] = 'R';
+  if ( p->subsystems & ROAR_SUBSYS_COMPLEX )
+   subsys[5] = 'X';
+
+  switch (format) {
+   case FORMAT_NATIVE:
+     printf("  %-13s %s - %s\n", roar_proto2str(p->proto), subsys, p->description);
+    break;
+   case FORMAT_WIKI:
+     printf("||%s || ||%s ||%s ||\n", roar_proto2str(p->proto), subsys, p->description);
+    break;
+   case FORMAT_CSV:
+     printf("%s,,%s,%s\n", roar_proto2str(p->proto), subsys, p->description);
+    break;
+  }
+ }
+}
 
 int client_stream_exec   (int client, int stream) {