Changeset 5275:811818eb5b81 in roaraudio for roard/roard.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/roard.c (modified) (5 diffs)

roard/roard.c

@@ -260 +260 @@
  printf(
         " --plugin-load FILE    - Load plugin FILE\n"
+        " --plugin-args ARGS    - Arguments for the plugin\n"
+        "                         (must be given before the --plugin-load)\n"
        );
 
@@ -417 +419 @@
 // printf("\n Options:\n\n");
  printf("\n");
-}
-
-static void list_proto (void) {
- printf("  Protocol Flag Subsys - Description\n");
- printf("------------------------------------------------------\n");
- printf("  roar          WM LRX - RoarAudio native protocol\n");
-#if !defined(ROAR_WITHOUT_DCOMP_EMUL_ESD) && defined(ROAR_HAVE_H_ESD)
- printf("  esd           W      - EsounD emulation\n");
-#endif
-#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
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
- printf("  rplay         W      - RPlay emulation\n");
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
- printf("  gopher               - The Internet Gopher Protocol\n");
-#endif
 }
 
@@ -1380 +1361 @@
  int    sysclocksync = 0;
 // char * server = ROAR_DEFAULT_SOCK_GLOBAL;
+ const char * plugin_args = NULL;
 #ifdef ROAR_SUPPORT_LISTEN
  int    port       = ROAR_DEFAULT_PORT;
@@ -1701 +1683 @@
   } else if ( strcmp(k, "--plugin-load") == 0 ) {
    _CKHAVEARGS(1);
-   if ( plugins_load(argv[++i]) == -1 ) {
+   if ( plugins_load(argv[++i], plugin_args) == -1 ) {
     ROAR_ERR("Can not load plugin");
    }
+   plugin_args = NULL;
+  } else if ( strcmp(k, "--plugin-args") == 0 ) {
+   _CKHAVEARGS(1);
+   plugin_args = argv[++i];
 
   } else if ( strcmp(k, "--guest-acclev") == 0 ) {
@@ -2140 +2126 @@
 
   } else if ( strcmp(k, "--list-proto") == 0 ) {
-   list_proto();
+   print_protolist(print_format);
    return 0;