Changeset 253:ba1197943bb9 in roaraudio

Timestamp:

07/24/08 15:52:53 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added replaygain vars to mixer

File:

• roard/mixer.c (modified) (2 diffs)

roard/mixer.c

@@ -130 +130 @@
   return -1;
 
- for (i = 0; i < samples; i++) {
-  s  = in[i];
-  s *= set->mixer[i % channels];
-  s /= set->scale;
-  out[i] = s;
+ if (set->rpg_mul == set->rpg_div) {
+  for (i = 0; i < samples; i++) {
+   s  = in[i];
+   s *= set->mixer[i % channels];
+   s /= set->scale;
+   out[i] = s;
+  }
+ } else {
+  for (i = 0; i < samples; i++) {
+   s  = in[i];
+   s *= set->mixer[i % channels] * set->rpg_mul;
+   s /= set->scale * set->rpg_div;
+   out[i] = s;
+  }
  }
 
@@ -148 +157 @@
   return -1;
 
- for (i = 0; i < samples; i++) {
-  s  = in[i];
-  s *= set->mixer[i % channels];
-  s /= set->scale;
-  out[i] = s;
+ if (set->rpg_mul == set->rpg_div) {
+  for (i = 0; i < samples; i++) {
+   s  = in[i];
+   s *= set->mixer[i % channels];
+   s /= set->scale;
+   out[i] = s;
+  }
+ } else {
+  for (i = 0; i < samples; i++) {
+   s  = in[i];
+   s *= set->mixer[i % channels] * set->rpg_mul;
+   s /= set->scale * set->rpg_div;
+   out[i] = s;
+  }
  }