Changeset 4614:3b1ab4d465e8 in roaraudio for roard/req.c

Timestamp:

11/21/10 16:51:56 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Support dir parameter in OINFO command (Closes: #31)

File:

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

roard/req.c

@@ -624 +624 @@
 int req_on_server_oinfo    (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
  struct roar_stream s;
+ int dir = ROAR_DIR_PLAY;
+ int subsys;
 //ROAR_DIR_OUTPUT
+
+ if ( mes->datalen != 0 ) {
+  if ( mes->datalen != 2 )
+   return -1;
+
+  if ( mes->data[0] != 0 )
+   return -1;
+
+  dir = mes->data[1];
+ }
+
+ subsys = streams_dir2subsys(dir);
 
  memset(&s, 0, sizeof(struct roar_stream));
@@ -630 +644 @@
  s.dir           = ROAR_DIR_MIXING;
  s.pos_rel_id    = -1;
- s.info.rate     = g_sa->rate;
- s.info.bits     = g_sa->bits;
- s.info.channels = g_sa->channels;
- s.info.codec    = g_sa->codec;
- s.pos           = g_pos;
+
+ switch (subsys) {
+  case ROAR_SUBSYS_WAVEFORM:
+    s.info.rate     = g_sa->rate;
+    s.info.bits     = g_sa->bits;
+    s.info.channels = g_sa->channels;
+    s.info.codec    = g_sa->codec;
+    s.pos           = g_pos;
+   break;
+#ifndef ROAR_WITHOUT_DCOMP_MIDI
+  case ROAR_SUBSYS_MIDI:
+   break;
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_LIGHT
+  case ROAR_SUBSYS_LIGHT:
+    s.info.rate     = ROAR_OUTPUT_CFREQ;
+    s.info.bits     = ROAR_LIGHT_BITS;
+    s.info.channels = g_light_state.channels;
+   break;
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_RAW
+  case ROAR_SUBSYS_RAW:
+    // no need to set anything here.
+   break;
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_RDTCS
+  case ROAR_SUBSYS_RDTCS:
+    s.info.rate     = ROAR_OUTPUT_CFREQ;
+    s.info.bits     = ROAR_RDTCS_BITS;
+    s.info.channels = ROAR_RDTCS_CHANNELS;
+    s.info.codec    = ROAR_RDTCS_CODEC;
+   break;
+#endif
+  default:
+    return -1;
+   break;
+ }
 
  if ( roar_stream_s2m(&s, mes) == -1 )