Changeset 17:411717cefded in roaraudio

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...

Files:

• TODO (modified) (1 diff)
• include/libroar/ctl.h (modified) (1 diff)
• include/roaraudio/audio.h (modified) (2 diffs)
• include/roaraudio/proto.h (modified) (1 diff)
• libroar/ctl.c (modified) (3 diffs)
• libroaresd/esdctl.c (modified) (1 diff)
• roard/commands.c (modified) (1 diff)
• roard/include/req.h (modified) (1 diff)
• roard/mixer.c (modified) (2 diffs)
• roard/req.c (modified) (2 diffs)
• roard/streams.c (modified) (1 diff)

TODO

@@ -6 +6 @@
  * add a lot other things
  * add code to handle streams with more than ROAR_MAX_CHANNELS channels
+ * fix byte-order bug in *_set_vol() and *_kick()
+ * get the volume changing code working

include/libroar/ctl.h

@@ -30 +30 @@
 int roar_kick         (struct roar_connection * con, int type, int id);
 
+int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels);
+
 // filter...
 int roar_ctl_f2m      (struct roar_message * m, unsigned char   filter, unsigned char   cmp, uint32_t   id);

include/roaraudio/audio.h

@@ -57 +57 @@
 #define ROAR_MAX_CHANNELS         64
 
+#define ROAR_SET_VOL_ALL           1
+#define ROAR_SET_VOL_ONE           2
+
 struct roar_audio_info {
  unsigned int rate;
@@ -65 +68 @@
 
 struct roar_mixer_settings {
- unsigned      channels;
+ //unsigned      channels;
  roar_intm16   scale;
  roar_intm16   mixer[ROAR_MAX_CHANNELS];

include/roaraudio/proto.h

@@ -33 +33 @@
 #define ROAR_CMD_KICK          18
 
+#define ROAR_CMD_SET_VOL       19
 
 #define ROAR_CMD_OK           254

libroar/ctl.c

@@ -117 +117 @@
 int roar_kick         (struct roar_connection * con, int type, int id) {
  struct roar_message m;
- uint16_t * info = m.data;
+ uint16_t * info = (uint16_t *) m.data;
 
  m.cmd     = ROAR_CMD_KICK;
@@ -123 +123 @@
  info[0] = type;
  info[1] = id;
+
+ if ( roar_req(con, &m, NULL) == -1 )
+  return -1;
+
+ if ( m.cmd != ROAR_CMD_OK )
+  return -1;
+
+ return 0;
+}
+
+int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels) {
+ struct roar_message m;
+ uint16_t * info = (uint16_t *) m.data;
+ int i;
+
+ m.cmd     = ROAR_CMD_SET_VOL;
+ m.datalen = (3 + channels) * 2;
+ info[0] = 0;
+ info[1] = id;
+ info[2] = ROAR_SET_VOL_ALL;
+
+ for (i = 0; i < channels; i++)
+  info[i+3] = mixer->mixer[i];
 
  if ( roar_req(con, &m, NULL) == -1 )
@@ -261 +284 @@
 
  strncpy(c->name, (m->data)+cur+1, m->data[cur]);
- c->name[m->data[cur]] = 0;
+ c->name[(int)m->data[cur]] = 0;
 
  return 0;

libroaresd/esdctl.c

@@ -277 +277 @@
 int esd_set_stream_pan( int esd, int stream_id,
                         int left_scale, int right_scale ) {
- return -1;
+ struct roar_connection con;
+ struct roar_mixer_settings mixer;
+
+ con.fh = esd;
+
+ mixer.mixer[0] = left_scale;
+ mixer.mixer[1] = right_scale;
+
+ ROAR_DBG("esd_set_stream_pan(esd=%i, stream_id=%i, left_scale=%i, right_scale=%i) = ?", 
+                esd, stream_id, left_scale, right_scale);
+
+ return roar_set_vol(&con, stream_id, &mixer, 2);
 }
 

roard/commands.c

@@ -22 +22 @@
   {ROAR_CMD_GET_STREAM,   "GET_STREAM",   req_on_get_stream},
   {ROAR_CMD_KICK,         "KICK",         req_on_kick},
+  {ROAR_CMD_SET_VOL,      "SET_VOL",      req_on_set_vol},
 
   {ROAR_CMD_ADD_DATA,     "ADD_DATA",     req_on_add_data},

roard/include/req.h

@@ -31 +31 @@
 int req_on_kick        (int client, struct roar_message * mes, char * data);
 
+int req_on_set_vol     (int client, struct roar_message * mes, char * data);
+
 int req_on_add_data    (int client, struct roar_message * mes, char * data);
 

roard/mixer.c

@@ -118 +118 @@
 
 int change_vol_8bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set) {
- char * in = input, out = output;
+ char * in = input, * out = output;
  int    i;
  int    s;
@@ -136 +136 @@
 
 int change_vol_16bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set) {
- int16_t * in = input, out = output;
+ int16_t * in = input, * out = output;
  int       i;
  int       s;

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) {

roard/streams.c

@@ -312 +312 @@
   }
 
+  if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(((struct roar_stream_server*)g_streams[id])->mixer)) == -1 )
+   return -1;
+
   // we habe outlen bytes more...
   todo    -= outlen;