Changeset 3562:ff598ca9df27 in roaraudio for plugins/roard

Timestamp:

02/27/10 17:08:45 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make better use of scale in esd emulation

File:

• plugins/roard/protocol-esound.c (modified) (4 diffs)

plugins/roard/protocol-esound.c

@@ -385 +385 @@
 
  if ( streams_get(stream, &ss) != -1 ) {
-  ss->mixer.mixer[0] = left  == 256 ? 65535 : left  * 256;
-  ss->mixer.mixer[1] = right == 256 ? 65535 : right * 256;
+  ss->mixer.scale    = 256;
+  ss->mixer.mixer[0] = left;
+  ss->mixer.mixer[1] = right;
   if ( streams_set_mixer(stream) != -1 )
    ok = 1;
@@ -467 +468 @@
        left = right = 256;
       } else {
-       left = right = ss->mixer.mixer[0] / 256;
+       left = right = ss->mixer.mixer[0] * 256 / ss->mixer.scale;
       }
       format |= ESD_MONO;
@@ -475 +476 @@
        left = 256;
       } else {
-       left = ss->mixer.mixer[0] / 256;
+       left = ss->mixer.mixer[0] * 256 / ss->mixer.scale;
       }
 
@@ -481 +482 @@
        right = 256;
       } else {
-       right = ss->mixer.mixer[1] / 256;
+       right = ss->mixer.mixer[1] * 256 / ss->mixer.scale;
       }