Changeset 963:9f2802d4302b in roaraudio

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

Files:

• include/libroar/stream.h (modified) (2 diffs)
• libroar/stream.c (modified) (1 diff)
• roarclients/roarctl.c (modified) (5 diffs)
• roard/req.c (modified) (3 diffs)

include/libroar/stream.h

@@ -48 +48 @@
 */
 
+#define ROAR_FLAG_NONE           0x00
+#define ROAR_FLAG_PRIMARY        0x01
+#define ROAR_FLAG_OUTPUT         0x02
+#define ROAR_FLAG_DRIVER         ROAR_FLAG_OUTPUT
+#define ROAR_FLAG_SOURCE         0x04
+#define ROAR_FLAG_SYNC           0x08
+
 struct roar_stream_info {
  int block_size;
@@ -53 +60 @@
  int post_underruns;
  int codec;
+ int flags;
+ char * driver;
 };
 

libroar/stream.c

@@ -282 +282 @@
   return -1;
 
+ memset(info, 0, sizeof(struct roar_stream_info));
+
  info->block_size     = data[2];
  info->pre_underruns  = data[3];
  info->post_underruns = data[4];
  info->codec          = data[5];
+ info->flags          = data[6];
 
  return 0;

roarclients/roarctl.c

@@ -27 +27 @@
 #include <grp.h>
 
+int g_verbose = 0;
 
 int display_mixer (struct roar_connection * con, int stream);
@@ -38 +39 @@
  printf("  --server SERVER         - Set server hostname\n"
         "  --help                  - Show this help\n"
+        "  --verbose   -v          - Show verbose output\n"
        );
 
@@ -156 +158 @@
  struct roar_stream s;
  struct roar_stream_info info;
+ char flags[80];
 
 
@@ -182 +185 @@
    printf("Input codec (streamed): %2i (%s%s)\n", info.codec, roar_codec2str(info.codec),
                                       info.codec == ROAR_CODEC_DEFAULT ? " native" : "");
-   printf("Input block size      : %i Byte\n", info.block_size);
-   printf("Underruns pre/post    : %i/%i\n",   info.pre_underruns, info.post_underruns);
+   if ( g_verbose ) {
+    printf("Input block size      : %i Byte\n", info.block_size);
+    printf("Underruns pre/post    : %i/%i\n",   info.pre_underruns, info.post_underruns);
+
+    *flags = 0;
+    if ( info.flags & ROAR_FLAG_PRIMARY )
+     strcat(flags, "primary ");
+    if ( info.flags & ROAR_FLAG_SYNC )
+     strcat(flags, "sync ");
+    if ( info.flags & ROAR_FLAG_OUTPUT )
+     strcat(flags, "output ");
+    if ( info.flags & ROAR_FLAG_SOURCE )
+     strcat(flags, "source ");
+
+    printf("Flags                 : %s\n", flags);
+   }
   }
   display_mixer(con, id[i]);
@@ -368 +385 @@
   if ( strcmp(k, "--server") == 0 ) {
    server = argv[++i];
+  } else if ( strcmp(k, "-v") == 0 || strcmp(k, "--verbose") == 0 ) {
+   g_verbose++;
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();

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