Changeset 3534:76f7586bdd3f in roaraudio for plugins/audacious

Timestamp:

02/19/10 22:07:40 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

update use of mixer

File:

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

plugins/audacious/roar.c

@@ -389 +389 @@
 
 void roar_get_volume(int *l, int *r) {
+ struct roar_mixer_settings mixer;
  int channels;
- struct roar_mixer_settings mixer;
+ float fs;
 
  if ( !(g_inst.state & STATE_CONNECTED) )
@@ -400 +401 @@
  }
 
+ 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;
  }
 }
@@ -414 +417 @@
   return;
 
- mixer.mixer[0] = l * 655.35;
- mixer.mixer[1] = r * 655.35;
+ mixer.mixer[0] = l;
+ mixer.mixer[1] = r;
+
+ mixer.scale    = 100;
 
  roar_set_vol(&(g_inst.con), g_inst.stream.id, &mixer, 2);