Changeset 4738:0bc3f6243414 in roaraudio

Timestamp:

01/31/11 01:10:01 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use switch() not if/else if/else

File:

• roard/req.c (modified) (1 diff)

roard/req.c

@@ -1421 +1421 @@
  info[2] = ROAR_NET2HOST16(info[2]);
 
- if ( info[2] == ROAR_SET_VOL_ALL ) {
-  chans = (mes->datalen/2) - 3;
-  ROAR_DBG("req_on_set_vol(*): mode is ROAR_SET_VOL_ALL, channes=%i", chans);
-
-  if ( chans >= ROAR_MAX_CHANNELS )
-   return -1;
-
-  ROAR_DBG("req_on_set_vol(*): mixer at %p", s->mixer.mixer);
-
-  for (i = 0; i < chans; i++) {
-   s->mixer.mixer[i] = ROAR_NET2HOST16(info[i+3]);
-   ROAR_DBG("req_on_set_vol(*): channel %i: %i", i, ROAR_NET2HOST16(info[i+3]));
-  }
-
-  s->mixer.scale = scale;
-
-  ROAR_DBG("req_on_set_vol(*): mixer changed!");
-
- } else if ( info[2] == ROAR_SET_VOL_ONE ) {
-  ROAR_DBG("req_on_set_vol(*): mode is ROAR_SET_VOL_ONE");
-  if ( ROAR_NET2HOST16(info[3]) >= ROAR_MAX_CHANNELS )
-   return -1;
-
-  s->mixer.mixer[ROAR_NET2HOST16(info[3])] = ROAR_NET2HOST16(info[4]);
-
-  s->mixer.scale = scale;
- } else {
-  return -1;
+ switch (info[2]) {
+  case ROAR_SET_VOL_ALL:
+    chans = (mes->datalen/2) - 3;
+    ROAR_DBG("req_on_set_vol(*): mode is ROAR_SET_VOL_ALL, channes=%i", chans);
+
+    if ( chans >= ROAR_MAX_CHANNELS )
+     return -1;
+
+    ROAR_DBG("req_on_set_vol(*): mixer at %p", s->mixer.mixer);
+
+    for (i = 0; i < chans; i++) {
+     s->mixer.mixer[i] = ROAR_NET2HOST16(info[i+3]);
+     ROAR_DBG("req_on_set_vol(*): channel %i: %i", i, ROAR_NET2HOST16(info[i+3]));
+    }
+
+    s->mixer.scale = scale;
+
+    ROAR_DBG("req_on_set_vol(*): mixer changed!");
+
+   break;
+  case ROAR_SET_VOL_ONE:
+    ROAR_DBG("req_on_set_vol(*): mode is ROAR_SET_VOL_ONE");
+    if ( ROAR_NET2HOST16(info[3]) >= ROAR_MAX_CHANNELS )
+     return -1;
+
+    s->mixer.mixer[ROAR_NET2HOST16(info[3])] = ROAR_NET2HOST16(info[4]);
+
+    s->mixer.scale = scale;
+   break;
+  default:
+    return -1;
  }