Changeset 3535:7543340c07c6 in roaraudio for libroaresd

Timestamp:

02/19/10 22:55:21 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

handle scale correctly

File:

• libroaresd/esdctl.c (modified) (3 diffs)

libroaresd/esdctl.c

@@ -200 +200 @@
  struct roar_mixer_settings mixer;
  int channels;
+ float fs;
  esd_player_info_t * new_player, * cur = NULL; // = NULL to avoid gcc warning
 
@@ -250 +251 @@
     new_player->left_vol_scale = new_player->right_vol_scale = 256;
    } else {
+    fs = mixer.scale / 257;
     if ( channels == 1 ) {
-     new_player->left_vol_scale = new_player->right_vol_scale = mixer.mixer[0] == 65536 ? 256 : mixer.mixer[0] / 256;
+     new_player->left_vol_scale = new_player->right_vol_scale = mixer.mixer[0] == mixer.scale ? 256 : mixer.mixer[0] / fs;
     } else {
      if ( channels != 2 ) {
       ROAR_ERR("esd_get_all_info(*): server seems to run in > 2 channel mode. ignoring any but the first two channels!");
      }
-     new_player->left_vol_scale  = mixer.mixer[0] == 65536 ? 256 : mixer.mixer[0] / 256;
-     new_player->right_vol_scale = mixer.mixer[1] == 65536 ? 256 : mixer.mixer[1] / 256;
+     new_player->left_vol_scale  = mixer.mixer[0] == mixer.scale ? 256 : mixer.mixer[0] / fs;
+     new_player->right_vol_scale = mixer.mixer[1] == mixer.scale ? 256 : mixer.mixer[1] / fs;
     }
    }
@@ -337 +339 @@
  roar_connect_fh(&con, esd);
 
- mixer.mixer[0] = left_scale  == 256 ? 65535 : left_scale  * 256;
- mixer.mixer[1] = right_scale == 256 ? 65535 : right_scale * 256;
+ mixer.scale    = 256;
+ mixer.mixer[0] = left_scale;
+ mixer.mixer[1] = right_scale;
 
  ROAR_DBG("esd_set_stream_pan(esd=%i, stream_id=%i, left_scale=%i, right_scale=%i) = ?",