Changeset 17:411717cefded in roaraudio for roard/req.c

Timestamp:

06/19/08 22:51:13 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

now we can change the volume, but it will not work if you set it... haha...

File:

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

roard/req.c

@@ -222 +222 @@
 
 int req_on_kick (int client, struct roar_message * mes, char * data) {
- uint16_t * info = mes->data;
+ uint16_t * info = (uint16_t *) mes->data;
 
  if ( mes->datalen != 4 )
@@ -241 +241 @@
 }
 
+int req_on_set_vol (int client, struct roar_message * mes, char * data) {
+ uint16_t * info = (uint16_t *) mes->data;
+ int stream;
+ struct roar_stream_server * s;
+ int i;
+ int chans;
+
+ ROAR_DBG("req_on_set_vol(*) = ?");
+ ROAR_DBG("req_on_set_vol(*): mes->datalen=%i", mes->datalen);
+
+ if ( mes->datalen < (4*2) )
+  return -1;
+
+ if ( info[0] != 0 ) // version
+  return -1;
+
+ stream = info[1];
+ ROAR_DBG("req_on_set_vol(*): stream=%i", stream);
+
+ // TODO: change this code.
+ //       we should not directly change the stream object but use some stream_*()-func
+ //       for that job.
+
+ if ( stream < 0 || stream >= ROAR_STREAMS_MAX )
+  return -1;
+
+ s = g_streams[stream];
+
+ if ( s == NULL )
+  return -1;
+
+ ROAR_DBG("req_on_set_vol(*): s=%p", s);
+
+ 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;
+
+  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]);
+  }
+
+  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 ( info[3] >= ROAR_MAX_CHANNELS )
+   return -1;
+
+  s->mixer.mixer[info[3]] = info[4];
+ } else {
+  return -1;
+ }
+
+ mes->cmd     = ROAR_CMD_OK;
+ mes->datalen = 0;
+
+ return 0;
+}
 
 int req_on_add_data (int client, struct roar_message * mes, char * data) {