Changeset 3529:fba86b5b08a7 in roaraudio for roarclients/roarctl.c

Timestamp:

02/19/10 17:36:33 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to read complet mixer from roard, including scale and rpg

File:

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

roarclients/roarctl.c

@@ -429 +429 @@
 
 int display_mixer (struct roar_connection * con, int stream) {
+ struct roar_mixer_settings mixer;
  int channels;
- struct roar_mixer_settings mixer;
  int i;
+ float fs;
 
  if ( roar_get_vol(con, stream, &mixer, &channels) == -1 ) {
@@ -444 +445 @@
 #endif
 
+ fs = (float)mixer.scale / 100.;
+
+ printf("Mixer ReplayGain      : %i/%i (%.2f%%" _DB ")\n", mixer.rpg_mul, mixer.rpg_div,
+                                                         100.*(float)mixer.rpg_mul/((float)mixer.rpg_div)
+#ifdef ROAR_HAVE_LIBM
+                          , 20*log10f((float)mixer.rpg_mul/(float)mixer.rpg_div)
+#endif
+       );
+
  for (i = 0; i < channels; i++)
-  printf("Mixer volume chan %2i  : %i (%.2f%%" _DB ")\n", i, mixer.mixer[i],
-                           (float)mixer.mixer[i]/655.35f
+  printf("Mixer volume chan %2i  : %i/%i (%.2f%%" _DB ")\n", i, mixer.mixer[i], mixer.scale,
+                           (float)mixer.mixer[i]/fs
 #ifdef ROAR_HAVE_LIBM
-                          , 20*log10f((float)mixer.mixer[i]/65535.f)
+                          , 20*log10f((float)mixer.mixer[i]/(float)mixer.scale)
 #endif
         );