Changeset 3529:fba86b5b08a7 in roaraudio

Timestamp:

02/19/10 17:36:33 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to read complet mixer from roard, including scale and rpg

Files:

• libroar/ctl.c (modified) (3 diffs)
• roarclients/roarctl.c (modified) (2 diffs)
• roard/req.c (modified) (3 diffs)

libroar/ctl.c

@@ -246 +246 @@
  m.cmd     = ROAR_CMD_GET_VOL;
  m.datalen = 2*2;
- info[0] = 0;
- info[1] = ROAR_HOST2NET16(id);
+ m.stream  = id;
+
+ info[0]   = ROAR_HOST2NET16(1);
 
  if ( roar_req(con, &m, NULL) == -1 )
@@ -255 +256 @@
   return -1;
 
- if ( info[0] != 0 )
+ if ( ROAR_NET2HOST16(info[0]) != 1 )
   return -1;
 
@@ -266 +267 @@
   return -1;
 
- mixer->scale   = 65535;
- mixer->rpg_mul = 1;
- mixer->rpg_div = 1;
+ mixer->scale   = ROAR_NET2HOST16(info[2]);
+ mixer->rpg_mul = ROAR_NET2HOST16(info[3]);
+ mixer->rpg_div = ROAR_NET2HOST16(info[4]);
 
  for (i = 0; i < info[1]; i++)
-  mixer->mixer[i] = ROAR_NET2HOST16(info[i+2]);
+  mixer->mixer[i] = ROAR_NET2HOST16(info[i+5]);
 
  return 0;

roarclients/roarctl.c

@@ -429 +429 @@
 
 int display_mixer (struct roar_connection * con, int stream) {
+ struct roar_mixer_settings mixer;
  int channels;
- struct roar_mixer_settings mixer;
  int i;
+ float fs;
 
  if ( roar_get_vol(con, stream, &mixer, &channels) == -1 ) {
@@ -444 +445 @@
 #endif
 
+ fs = (float)mixer.scale / 100.;
+
+ printf("Mixer ReplayGain      : %i/%i (%.2f%%" _DB ")\n", mixer.rpg_mul, mixer.rpg_div,
+                                                         100.*(float)mixer.rpg_mul/((float)mixer.rpg_div)
+#ifdef ROAR_HAVE_LIBM
+                          , 20*log10f((float)mixer.rpg_mul/(float)mixer.rpg_div)
+#endif
+       );
+
  for (i = 0; i < channels; i++)
-  printf("Mixer volume chan %2i  : %i (%.2f%%" _DB ")\n", i, mixer.mixer[i],
-                           (float)mixer.mixer[i]/655.35f
+  printf("Mixer volume chan %2i  : %i/%i (%.2f%%" _DB ")\n", i, mixer.mixer[i], mixer.scale,
+                           (float)mixer.mixer[i]/fs
 #ifdef ROAR_HAVE_LIBM
-                          , 20*log10f((float)mixer.mixer[i]/65535.f)
+                          , 20*log10f((float)mixer.mixer[i]/(float)mixer.scale)
 #endif
         );

roard/req.c

@@ -808 +808 @@
 int req_on_get_vol (int client, struct roar_message * mes, char * data) {
  uint16_t * info = (uint16_t *) mes->data;
+ uint16_t   version = -1;
  int stream;
  struct roar_stream_server * s;
@@ -816 +817 @@
  ROAR_DBG("req_on_get_vol(*): mes->datalen=%i", mes->datalen);
 
- if ( mes->datalen < (2*2) )
-  return -1;
-
- if ( info[0] != 0 ) // version
-  return -1;
-
- stream = ROAR_NET2HOST16(info[1]);
+ if ( mes->datalen < 2 ) {
+  return -1;
+ }
+
+ version = ROAR_NET2HOST16(info[0]);
+
+ switch (version) {
+  case 0:
+    if ( mes->datalen < (2*2) )
+     return -1;
+
+    stream = ROAR_NET2HOST16(info[1]);
+   break;
+  case 1:
+    stream = mes->stream;
+   break;
+  default:
+    return -1;
+   break;
+ }
+
  ROAR_DBG("req_on_get_vol(*): stream=%i", stream);
 
@@ -841 +856 @@
  // ok, we have everything
 
- info[0] = 0;
- info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
-
- for (i = 0; i < chans; i++)
-  info[2+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
-
- mes->datalen = (2 + chans)*2;
+ info[0] = ROAR_HOST2NET16(version);
+
+ switch (version) {
+  case 0:
+    info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
+
+    for (i = 0; i < chans; i++)
+     info[2+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
+
+     mes->datalen = (2 + chans)*2;
+   break;
+  case 1:
+    info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
+    info[2] = ROAR_HOST2NET16(s->mixer.scale);
+    info[3] = ROAR_HOST2NET16(s->mixer.rpg_mul);
+    info[4] = ROAR_HOST2NET16(s->mixer.rpg_div);
+
+    for (i = 0; i < chans; i++)
+     info[5+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
+
+     mes->datalen = (5 + chans)*2;
+   break;
+  default:
+    return -1;
+   break;
+ }
+
  mes->cmd = ROAR_CMD_OK;