Changeset 963:9f2802d4302b in roaraudio for roard/req.c

Timestamp:

12/09/08 15:43:39 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to read stream flags (currently primary and output), prepered driver name request support

File:

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

roard/req.c

@@ -448 +448 @@
 int req_on_get_stream_para (int client, struct roar_message * mes, char * data) {
  struct roar_stream * s;
+ struct roar_stream_server * ss;
  struct roar_audio_info * audio_info;
  uint16_t * d = (uint16_t *) mes->data;
@@ -459 +460 @@
  }
 
- if ( streams_get(mes->stream, (struct roar_stream_server **)&s) == -1 ) {
+ if ( streams_get(mes->stream, &ss) == -1 ) {
   ROAR_WARN("req_on_get_stream_para(*): request on non existing (or other error?) stream %i", mes->stream);
   return -1;
  }
+
+ s = ROAR_STREAM(ss);
 
  audio_info = &(s->info);
@@ -471 +474 @@
  }
 
- mes->datalen = 2*6;
+ mes->datalen = 2*7;
 
  d[2] = ROAR_OUTPUT_CALC_OUTBUFSIZE(audio_info);
- d[3] = ROAR_STREAM_SERVER(s)->pre_underruns;
- d[4] = ROAR_STREAM_SERVER(s)->post_underruns;
- d[5] = ROAR_STREAM_SERVER(s)->codec_orgi;
+ d[3] = ss->pre_underruns;
+ d[4] = ss->post_underruns;
+ d[5] = ss->codec_orgi;
+ d[6] = ROAR_FLAG_NONE | (ss->primary ? ROAR_FLAG_PRIMARY : 0) | (ss->driver_id != -1 ? ROAR_FLAG_OUTPUT : 0);
 
  for (i = 0; i < mes->datalen/2; i++) {