Changeset 3530:8ca4bb4cc5b0 in roaraudio for roarclients/roarctl.c

Timestamp:

02/19/10 18:09:41 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to give scale parameter to roarctl

File:

• roarclients/roarctl.c (modified) (8 diffs)

roarclients/roarctl.c

@@ -435 +435 @@
 
  if ( roar_get_vol(con, stream, &mixer, &channels) == -1 ) {
-  fprintf(stderr, "Error: can not get stream mixer info\n");
+  fprintf(stderr, "Error: can not get stream mixer info for stream %i\n", stream);
   return -1;
  }
@@ -465 +465 @@
 }
 
-static unsigned int set_mixer_parse_volume (char * k, int len) {
+static unsigned int set_mixer_parse_volume (char * k, int len, uint16_t scale) {
+ float fs = scale;
+
  switch (k[len - 1]) {
   case '%':
     k[len - 1] = 0;
-    return (atof(k)*65535.f)/100;
+    return (atof(k)*fs)/100.;
    break;
 #ifdef ROAR_HAVE_LIBM
@@ -479 +481 @@
 
     k[len - 2] = 0;
-    return powf(10, atof(k)/20.f)*65535.f;
+    return powf(10, atof(k)/20.f)*fs;
    break;
 #endif
@@ -488 +490 @@
 
 int set_mixer (struct roar_connection * con, int * cur, int max, char * arg[]) {
+ uint16_t scale = 65535;
  int chans = 0;
  int id;
@@ -506 +509 @@
 
  if ( roar_get_vol(con, id, &old_mixer, &old_chans) == -1 ) {
-  fprintf(stderr, "Error: can not get stream mixer info\n");
-  return -1;
- }
-
+  fprintf(stderr, "Error: can not get stream mixer info for stream %i\n", id);
+  return -1;
+ }
+
+ if ( !strcmp(arg[*cur + 1], "scale") ) {
+  (*cur)++; // 'scale'
+  scale = atoi(arg[++(*cur)]);
+ }
 
 // TODO: clean up code here as the % vs. abs code is very duplicate...
@@ -522 +529 @@
   len = strlen(k);
 
-  vol_mono = set_mixer_parse_volume(k, len);
+  vol_mono = set_mixer_parse_volume(k, len, scale);
 
   for (i = 0; i < old_chans; i++)
@@ -538 +545 @@
   len = strlen(k);
 
-  vol_l = set_mixer_parse_volume(k, len);
+  vol_l = set_mixer_parse_volume(k, len, scale);
 
   k   = arg[++(*cur)];
   len = strlen(k);
 
-  vol_r = set_mixer_parse_volume(k, len);
+  vol_r = set_mixer_parse_volume(k, len, scale);
 
   vol_mono = (vol_l + vol_r) / 2;
@@ -597 +604 @@
    len = strlen(k);
 
-   mixer.mixer[i] = set_mixer_parse_volume(k, len);
-  }
- }
-
- mixer.scale = 65535;
+   mixer.mixer[i] = set_mixer_parse_volume(k, len, scale);
+  }
+ }
+
+ mixer.scale = scale;
 
  return roar_set_vol(con, id, &mixer, chans);