Changeset 252:c5d4c35bbbe7 in roaraudio

Timestamp:

07/24/08 15:51:48 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed byte-order bug in *_set/get_vol(), hey! one bug more :)

File:

• roard/req.c (modified) (6 diffs)

roard/req.c

@@ -423 +423 @@
   return -1;
 
- stream = info[1];
+ stream = ROAR_NET2HOST16(info[1]);
  ROAR_DBG("req_on_set_vol(*): stream=%i", stream);
 
@@ -440 +440 @@
  ROAR_DBG("req_on_set_vol(*): s=%p", s);
 
+ info[2] = ROAR_NET2HOST16(info[2]);
+
  if ( info[2] == ROAR_SET_VOL_ALL ) {
   chans = (mes->datalen/2) - 3;
@@ -450 +452 @@
 
   for (i = 0; i < chans; i++) {
-   s->mixer.mixer[i] = info[i+3];
-   ROAR_DBG("req_on_set_vol(*): channel %i: %i", i, info[i+3]);
+   s->mixer.mixer[i] = ROAR_NET2HOST16(info[i+3]);
+   ROAR_DBG("req_on_set_vol(*): channel %i: %i", i, ROAR_NET2HOST16(info[i+3]));
   }
 
@@ -458 +460 @@
  } else if ( info[2] == ROAR_SET_VOL_ONE ) {
   ROAR_DBG("req_on_set_vol(*): mode is ROAR_SET_VOL_ONE");
-  if ( info[3] >= ROAR_MAX_CHANNELS )
+  if ( ROAR_NET2HOST16(info[3]) >= ROAR_MAX_CHANNELS )
    return -1;
 
-  s->mixer.mixer[info[3]] = info[4];
+  s->mixer.mixer[ROAR_NET2HOST16(info[3])] = ROAR_NET2HOST16(info[4]);
  } else {
   return -1;
@@ -488 +490 @@
   return -1;
 
- stream = info[1];
+ stream = ROAR_NET2HOST16(info[1]);
  ROAR_DBG("req_on_get_vol(*): stream=%i", stream);
 
@@ -508 +510 @@
 
  info[0] = 0;
- info[1] = chans = ROAR_STREAM(s)->info.channels;
+ info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
 
  for (i = 0; i < chans; i++)
-  info[2+i] = s->mixer.mixer[i];
+  info[2+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
 
  mes->datalen = (2 + chans)*2;