Changeset 961:ac5a0e9430cf in roaraudio

Timestamp:

12/08/08 22:50:14 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support vor primary output streams

File:

• roard/roard.c (modified) (6 diffs)

roard/roard.c

@@ -60 +60 @@
  printf(" -oO OPTS              - Set output options\n");
  printf(" -oN                   - Adds another output\n");
+ printf(" -oP                   - Mark output as primary\n");
 
  printf("\nSource Options:\n\n");
@@ -122 +123 @@
 #define R_SETGID 2
 
-int add_output (char * drv, char * dev, char * opts) {
+int add_output (char * drv, char * dev, char * opts, int prim) {
  int stream;
  struct roar_stream * s;
@@ -192 +193 @@
 
  client_stream_add(g_source_client, stream);
+
+ if ( prim )
+  streams_mark_primary(stream);
 
  return 0;
@@ -217 +221 @@
  char * o_dev     = NULL;
  char * o_opts    = NULL;
+ int    o_prim    = 0;
  char * sock_grp  = ROAR_DEFAULT_SOCKGRP;
  char * sock_user = NULL;
@@ -330 +335 @@
   } else if ( strcmp(k, "-oO") == 0 ) {
    o_opts = argv[++i];
+  } else if ( strcmp(k, "-oP") == 0 ) {
+   o_prim = 1;
   } else if ( strcmp(k, "-oN") == 0 ) {
-   add_output(o_drv, o_dev, o_opts);
-   o_drv = o_dev = o_opts = NULL;
+   add_output(o_drv, o_dev, o_opts, o_prim);
+   o_drv  = o_dev = o_opts = NULL;
+   o_prim = 0;
 
   } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) {
@@ -433 +441 @@
 
  if ( o_drv != NULL )
-  add_output(o_drv, o_dev, o_opts);
+  add_output(o_drv, o_dev, o_opts, o_prim);
 
  ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);