Changeset 1103:bb5ee2384821 in roaraudio

Timestamp:

01/11/09 02:12:30 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

disable options needing libm

Location:

roarclients

Files:

• roarfctest.c (modified) (2 diffs)
• roarfilt.c (modified) (8 diffs)
• roarsin.c (modified) (2 diffs)
• roarvumeter.c (modified) (2 diffs)

roarclients/roarfctest.c

@@ -23 +23 @@
  */
 
+#include <roaraudio.h>  /* libroar */
+
+#ifdef ROAR_HAVE_LIBM
+
 #include <math.h>       /* sin() */
 #include <stdio.h>      /* *printf*() */
-#include <roaraudio.h>  /* libroar */
 #include <libroardsp/libroardsp.h>
 
@@ -131 +134 @@
 }
 
+#else
+int main (void) {
+ fprintf(stderr, "Error: No Math library support compiled in.\n");
+ return 1;
+}
+#endif
+
 //ll

roarclients/roarfilt.c

@@ -25 +25 @@
 #include <roaraudio.h>
 #include <libroardsp/libroardsp.h>
+
+#ifdef ROAR_HAVE_LIBM
 #include <math.h>
+#endif
 
 #define BUFSIZE 1024
+#ifdef ROAR_HAVE_LIBM
 struct {
  uint16_t a, b;
  int16_t  old[ROAR_MAX_CHANNELS];
 } g_lowpass;
+#endif
 
 void usage (void) {
@@ -49 +54 @@
         "  --mul VAL          - Set mul\n"
         "  --div VAL          - Set div\n"
+#ifdef ROAR_HAVE_LIBM
         "  --lowpass freq     - lowpass filter\n"
+#endif
         "  --filter  name     - add filter name\n"
         "  --ffreq   freq     - set filter freq\n"
@@ -80 +87 @@
 }
 
+#ifdef ROAR_HAVE_LIBM
 void logs2 (void * data, float scale, int len) {
  int16_t * samples = (int16_t *) data;
@@ -126 +134 @@
  }
 }
+#endif
 
 int main (int argc, char * argv[]) {
@@ -146 +155 @@
  struct roar_stream         stream;
 
+#ifdef ROAR_HAVE_LIBM
  memset(&g_lowpass, 0, sizeof(g_lowpass));
+#endif
 
  roardsp_fchain_init(&fc);
@@ -173 +184 @@
   } else if ( strcmp(k, "--log") == 0 ) {
    logscale = atof(argv[++i]);
+#ifdef ROAR_HAVE_LIBM
   } else if ( strcmp(k, "--lowpass") == 0 ) {
    lp = exp(-2 * M_PI * atof(argv[++i]) / rate) * 65536;
    g_lowpass.b = lp;
    g_lowpass.a = 65536 - lp;
+#endif
 //   printf("lowpass: A=%i, B=%i\n", g_lowpass.a, g_lowpass.b);
   } else if ( strcmp(k, "--filter") == 0 ) {
@@ -221 +234 @@
  }
 
- if ( mul == div && logscale == 0 && g_lowpass.a == 0 && roardsp_fchain_num(&fc) == 0 ) {
+ if ( mul == div &&
+#ifdef ROAR_HAVE_LIBM
+      logscale == 0 && g_lowpass.a == 0 &&
+#endif
+      roardsp_fchain_num(&fc) == 0 ) {
   fprintf(stderr, "Error: filter is useless!\n");
   return 0;
@@ -230 +247 @@
    if ( mul != div )
     vol2((void*)buf, mul, div, i);
+#ifdef ROAR_HAVE_LIBM
    if ( logscale )
     logs2((void*)buf, logscale, i);
    if ( g_lowpass.a )
     lowpass2((void*)buf, i, channels);
+#endif
    roardsp_fchain_calc(&fc, (void*)buf, (8*i)/bits);
    if (write(fh, buf, i) != i)

roarclients/roarsin.c

@@ -23 +23 @@
  */
 
+#include <roaraudio.h>  /* libroar */
+
+#ifdef ROAR_HAVE_LIBM
+
 #include <math.h>       /* sin() */
 #include <stdio.h>      /* *printf*() */
-#include <roaraudio.h>  /* libroar */
 
 double rect (double x) {
@@ -123 +126 @@
 }
 
+#else
+int main (void) {
+ fprintf(stderr, "Error: No Math library support compiled in.\n");
+ return 1;
+}
+#endif
+
 //ll

roarclients/roarvumeter.c

@@ -24 +24 @@
 
 #include <roaraudio.h>
+
+#ifdef ROAR_HAVE_LIBM
+
 #include <math.h>
 
@@ -135 +138 @@
 }
 
+#else
+int main (void) {
+ fprintf(stderr, "Error: No Math library support compiled in.\n");
+ return 1;
+}
+#endif
+
 //ll