Changeset 2485:1cbb82cde915 in roaraudio

Timestamp:

08/23/09 21:31:33 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make sources optional

Location:

roard

Files:

• roard.c (modified) (9 diffs)
• sources.c (modified) (2 diffs)

roard/roard.c

@@ -86 +86 @@
  printf(" -oP                   - Mark output as primary\n");
 
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
  printf("\nSource Options:\n\n");
  printf(" -s  --source DRV      - Use DRV as input driver\n"
@@ -94 +95 @@
        );
  printf(" --list-sources        - List all sources\n");
+#endif
 
  printf("\nCodec Filter Options:\n\n");
@@ -732 +734 @@
  }
 
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
  if ( sources_init() == -1 ) {
   ROAR_ERR("Can not init sources!");
@@ -741 +744 @@
   return 1;
  }
+#endif
 
 #ifdef ROAR_HAVE_MAIN_ARGS
@@ -873 +877 @@
 
   } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    s_drv = argv[++i];
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
   } else if ( strcmp(k, "-S") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    s_dev = argv[++i];
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
   } else if ( strcmp(k, "-sO") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    s_opt = argv[++i];
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
   } else if ( strcmp(k, "-sC") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    s_con = argv[++i];
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
   } else if ( strcmp(k, "-sP") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    s_prim = 1;
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
   } else if ( strcmp(k, "-sN") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    if ( sources_add(s_drv, s_dev, s_con, s_opt, s_prim) == -1 ) {
     ROAR_ERR("main(*): adding source '%s' via '%s' failed!", s_dev, s_drv);
@@ -889 +914 @@
    s_drv = "cf";
    s_prim = 0;
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
   } else if ( strcmp(k, "--list-sources") == 0 ) {
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
    print_sourcelist();
    return 0;
+#else
+   ROAR_ERR("main(*): No support for sources compiled in");
+#endif
 
   } else if ( strcmp(k, "--light-channels") == 0 ) {
@@ -1027 +1059 @@
 #endif
 
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
  if ( s_dev != NULL ) {
   if ( sources_add(s_drv, s_dev, s_con, s_opt, s_prim) == -1 ) {
@@ -1032 +1065 @@
   }
  }
+#endif
 
  add_output(o_drv, o_dev, o_opts, o_prim, o_count);
@@ -1295 +1329 @@
  cleanup_listen_socket(0);
 
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
  sources_free();
+#endif
  streams_free();
  clients_free();

roard/sources.c

@@ -25 +25 @@
 #include "roard.h"
 
+#ifndef ROAR_WITHOUT_DCOMP_SOURCES
+
 struct roar_source g_source[] = {
  {"raw",  "Raw source",                  "/some/file",     SRC_FLAG_FHSEC, ROAR_SUBSYS_WAVEFORM, NULL,  sources_add_raw},
@@ -440 +442 @@
 }
 
+#endif
+
 //ll