Changeset 4614:3b1ab4d465e8 in roaraudio

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)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/ctl.h (modified) (1 diff)
• libroar/ctl.c (modified) (3 diffs)
• roarclients/roarctl.c (modified) (4 diffs)
• roard/include/streams.h (modified) (1 diff)
• roard/req.c (modified) (2 diffs)
• roard/streams.c (modified) (2 diffs)

ChangeLog

@@ -8 +8 @@
         * Added RSound's new 32 bit support to libroarrsound
         * Updated docs
+        * Support dir parameter in OINFO command (Closes: #31)
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

include/libroar/ctl.h

@@ -47 +47 @@
 int roar_terminate      (struct roar_connection * con, int terminate);
 int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s);
+int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir);
 
 

libroar/ctl.c

@@ -56 +56 @@
 }
 
-int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * sa) {
+int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s) {
+ return roar_server_oinfo2(con, s, -1);
+}
+
+int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir) {
  struct roar_message mes;
 
@@ -62 +66 @@
 
  mes.cmd     = ROAR_CMD_SERVER_OINFO;
- mes.datalen = 0;
+
+ if ( dir == -1 ) {
+  mes.datalen = 0;
+ } else {
+  mes.datalen = 2;
+  mes.data[0] = 0;
+  mes.data[1] = dir;
+ }
 
  if ( roar_req(con, &mes, NULL) == -1 )
@@ -70 +81 @@
   return -1;
 
- if ( roar_stream_m2s(sa, &mes) == -1 )
+ if ( roar_stream_m2s(s, &mes) == -1 )
   return -1;
 

roarclients/roarctl.c

@@ -116 +116 @@
         "  serverinfo              - Gets general information about the server\n"
         "  serveroinfo             - Gets Information about server output\n"
+        "  serveroinfo2 DIR        - Gets Information about server output for stream direction dir\n"
         "  serverstandards         - Gets list of server supported standards\n"
         "  listclients             - Gets Information about clients\n"
@@ -231 +232 @@
 #undef _pm
 
-void server_oinfo (struct roar_connection * con) {
+void server_oinfo (struct roar_connection * con, int dir) {
  struct roar_stream s;
 
- if ( roar_server_oinfo(con, &s) == -1 ) {
+ if ( roar_server_oinfo2(con, &s, dir) == -1 ) {
   fprintf(stderr, "Error: can not get server output info\n");
   return;
@@ -1145 +1146 @@
    server_info(&con);
   } else if ( !strcmp(k, "serveroinfo") ) {
-   server_oinfo(&con);
+   server_oinfo(&con, -1);
+  } else if ( !strcmp(k, "serveroinfo2") ) {
+   t = roar_str2dir(argv[++i]);
+   if ( t == -1 ) {
+    fprintf(stderr, "Error: unknown stream direction: %s\n", argv[i]);
+   } else {
+    server_oinfo(&con, t);
+   }
   } else if ( !strcmp(k, "serverstandards") ) {
    server_standards(&con);
@@ -1153 +1161 @@
    list_streams(&con);
   } else if ( !strcmp(k, "allinfo") ) {
-   server_oinfo(&con);
+   server_oinfo(&con, -1);
    printf("\n");
    list_clients(&con);

roard/include/streams.h

@@ -136 +136 @@
 int streams_set_role   (int id, int role);
 
+int streams_dir2subsys (int dir);
 int streams_get_subsys (int id);
 int streams_get_ssdir  (int id);

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 )

roard/streams.c

@@ -447 +447 @@
   return -1;
 
- switch (ROAR_STREAM(ss)->dir) {
+ if ( ROAR_STREAM(ss)->dir == ROAR_DIR_THRU )
+  return streams_get_subsys(ROAR_STREAM(ss)->pos_rel_id);
+
+ return streams_dir2subsys(ROAR_STREAM(ss)->dir);
+}
+
+int streams_dir2subsys (int dir) {
+ switch (dir) {
   case ROAR_DIR_PLAY:
   case ROAR_DIR_RECORD:
@@ -471 +478 @@
   case ROAR_DIR_COMPLEX_OUT:
     return ROAR_SUBSYS_COMPLEX;
-   break;
-  case ROAR_DIR_THRU:
-    return streams_get_subsys(ROAR_STREAM(ss)->pos_rel_id);
    break;
   case ROAR_DIR_MIXING: