Changeset 26:a1db679a45a5 in roaraudio for libroaresd

Timestamp:

06/21/08 13:31:50 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added code to support roar_get_vol() (player->left_vol_scale/player->right_vol_scale)

File:

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

libroaresd/esdctl.c

@@ -70 +70 @@
  printf("player %i right   = %i\n",        player_info->source_id, player_info->right_vol_scale );
 }
+
 void esd_print_sample_info( esd_sample_info_t *sample_info ) {
 }
@@ -160 +161 @@
  struct roar_stream s;
  struct roar_connection con[1];
+ struct roar_mixer_settings mixer;
+ int channels;
  esd_player_info_t * new_player, * cur = NULL; // = NULL to avoid gcc warning
 
@@ -205 +208 @@
 
    new_player->server         = r->server;
-   new_player->left_vol_scale = new_player->right_vol_scale = 256; // TODO: add data from the mixer
+
+   if ( roar_get_vol(con, c.execed, &mixer, &channels) == -1 ) {
+    ROAR_ERR("esd_get_all_info(*): can not get stream mixer info");
+    new_player->left_vol_scale = new_player->right_vol_scale = 256;
+   } else {
+    if ( channels == 1 ) {
+     new_player->left_vol_scale = new_player->right_vol_scale = mixer.mixer[0] == 65536 ? 256 : mixer.mixer[0] / 256;
+    } 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;
+    }
+   }
+
 
    if ( r->player_list == NULL ) {