Changeset 1145:a5edc8a12b46 in roaraudio for roard

Timestamp:

01/21/09 22:58:27 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use the new driver interface by default

File:

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

roard/roard.c

@@ -124 +124 @@
 #define R_SETGID 2
 
-int add_output (char * drv, char * dev, char * opts, int prim) {
+int add_output (char * drv, char * dev, char * opts, int prim, int count) {
  int stream;
  struct roar_stream * s;
@@ -133 +133 @@
 
  ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = ?", drv, dev, opts);
+
+ if ( drv == NULL && count == 0 ) {
+  drv  = ROAR_DRIVER_DEFAULT;
+  prim = 1;
+  sync = 1;
+ }
 
  if ( (stream = streams_new()) == -1 ) {
@@ -193 +199 @@
  ROAR_STREAM_SERVER(s)->codec_orgi = codec;
 
- if ( driver_openvio(&(ss->vio), &(ss->driver_id), drv, dev, &(s->info), -1) ) {
+ if ( driver_openvio(&(ss->vio), &(ss->driver_id), drv, dev, &(s->info), -1) == -1 ) {
   streams_delete(stream);
   ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
@@ -239 +245 @@
  char * o_opts    = NULL;
  int    o_prim    = 0;
+ int    o_count   = 0;
  char * sock_grp  = ROAR_DEFAULT_SOCKGRP;
  char * sock_user = NULL;
@@ -362 +369 @@
    o_prim = 1;
   } else if ( strcmp(k, "-oN") == 0 ) {
-   add_output(o_drv, o_dev, o_opts, o_prim);
+   if ( add_output(o_drv, o_dev, o_opts, o_prim, o_count) != -1 )
+    o_count++;
+
    o_drv  = o_dev = o_opts = NULL;
    o_prim = 0;
@@ -472 +481 @@
  }
 
- if ( o_drv != NULL )
-  add_output(o_drv, o_dev, o_opts, o_prim);
+ add_output(o_drv, o_dev, o_opts, o_prim, o_count);
 
  ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
@@ -535 +543 @@
  }
 
+ if ( driver == NULL ) {
+  driver = "null";
+ } else {
+  ROAR_WARN("Usage of old driver interface. use -o not -d!");
+ }
+
  if ( driver_open(&drvinst, &drvid, driver, device, &sa) == -1 ) {
   ROAR_ERR("Can not open output driver!");