Changeset 2916:3df957c2297b in roaraudio

Timestamp:

10/16/09 16:48:20 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support dB scale to roarctl

Location:

roarclients

Files:

• Makefile (modified) (1 diff)
• roarctl.c (modified) (5 diffs)

roarclients/Makefile

@@ -46 +46 @@
         $L
 roarctl: roarctl.o
-        $L
+        $L $(lib_m)
 roarmon: roarmon.o
         $L

roarclients/roarctl.c

@@ -36 +36 @@
 #include <sys/time.h>
 #include <time.h>
+
+#ifdef ROAR_HAVE_LIBM
+#include <math.h>
+#endif
 
 int g_verbose = 0;
@@ -423 +427 @@
  }
 
+#ifdef ROAR_HAVE_LIBM
+#define _DB ", %.2fdB"
+#else
+#define _DB ""
+#endif
+
  for (i = 0; i < channels; i++)
-  printf("Mixer volume chan %2i  : %i (%.2f%%)\n", i, mixer.mixer[i], (float)mixer.mixer[i]/655.35);
+  printf("Mixer volume chan %2i  : %i (%.2f%%" _DB ")\n", i, mixer.mixer[i],
+                           (float)mixer.mixer[i]/655.35f
+#ifdef ROAR_HAVE_LIBM
+                          , 20*log10f((float)mixer.mixer[i]/65535.f)
+#endif
+        );
 
  return 0;
+}
+
+static unsigned int set_mixer_parse_volume (char * k, int len) {
+ switch (k[len - 1]) {
+  case '%':
+    k[len - 1] = 0;
+    return (atof(k)*65535.f)/100;
+   break;
+#ifdef ROAR_HAVE_LIBM
+  case 'b':
+  case 'B':
+    // TODO: can we hanle the error better?
+    if ( len < 2 )
+     return 0;
+
+    k[len - 2] = 0;
+    return powf(10, atof(k)/20.f)*65535.f;
+   break;
+#endif
+ }
+
+ return atoi(k);
 }
 
@@ -464 +501 @@
   len = strlen(k);
 
-  if ( k[len - 1] == '%' ) {
-   k[len - 1] = 0;
-   vol_mono = (atof(k)*65535)/100;
-  } else {
-   vol_mono = atoi(k);
-  }
+  vol_mono = set_mixer_parse_volume(k, len);
 
   for (i = 0; i < old_chans; i++)
@@ -485 +517 @@
   len = strlen(k);
 
-  if ( k[len - 1] == '%' ) {
-   k[len - 1] = 0;
-   vol_l = (atof(k)*65535)/100;
-  } else {
-   vol_l = atoi(k);
-  }
+  vol_l = set_mixer_parse_volume(k, len);
 
   k   = arg[++(*cur)];
   len = strlen(k);
 
-  if ( k[len - 1] == '%' ) {
-   k[len - 1] = 0;
-   vol_r = (atof(k)*65535)/100;
-  } else {
-   vol_r = atoi(k);
-  }
+  vol_r = set_mixer_parse_volume(k, len);
 
   vol_mono = (vol_l + vol_r) / 2;
@@ -554 +576 @@
    len = strlen(k);
 
-   if ( k[len - 1] == '%' ) {
-    k[len - 1] = 0;
-    mixer.mixer[i] = (atof(k)*(int)65535)/100;
-   } else {
-    mixer.mixer[i] = atoi(k);
-   }
+   mixer.mixer[i] = set_mixer_parse_volume(k, len);
   }
  }