Changeset 3532:6bea69c796d7 in roaraudio for plugins/xmms

Timestamp:

02/19/10 21:58:13 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

we handle our favorit scale

File:

• plugins/xmms/roar.c (modified) (3 diffs)

plugins/xmms/roar.c

@@ -319 +319 @@
  int channels;
  struct roar_mixer_settings mixer;
+ float fs;
 
  if ( !(g_inst.state & STATE_CONNECTED) )
@@ -328 +329 @@
  }
 
+ fs = (float)mixer.scale/100.;
+
  if ( channels == 1 ) {
-  *l = *r = mixer.mixer[0]/655.35;
+  *l = *r = mixer.mixer[0]/fs;
  } else {
-  *l = mixer.mixer[0]/655.35;
-  *r = mixer.mixer[1]/655.35;
+  *l = mixer.mixer[0]/fs;
+  *r = mixer.mixer[1]/fs;
  }
 }
@@ -348 +351 @@
  g_inst.mixer.r = r;
 
- mixer.mixer[0] = l * 655.35;
- mixer.mixer[1] = r * 655.35;
- mixer.scale    = 65535;
+ mixer.mixer[0] = l;
+ mixer.mixer[1] = r;
+ mixer.scale    = 100;
 
  roar_set_vol(&(g_inst.con), g_inst.stream.id, &mixer, 2);