Changeset 5242:97239101cee9 in roaraudio for roard/output.c

Timestamp:

11/13/11 00:03:27 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some roard compiler warnings cleanup

File:

• roard/output.c (modified) (1 diff)

roard/output.c

@@ -460 +460 @@
  _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s)); // ignore errors here
 
- if ( blocks != -1 )
-  roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLOCKS, &blocks);
-
- if ( blocksize != -1 )
-  roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLKSIZE, &blocksize);
+ if ( blocks != -1 ) {
+  if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLOCKS, &blocks) == -1 ) {
+   ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s'): can not set number of blocks.", drv, dev, opts);
+  }
+ }
+
+ if ( blocksize != -1 ) {
+  if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLKSIZE, &blocksize) == -1 ) {
+   ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s'): can not set blocksize.", drv, dev, opts);
+  }
+ }
 
  // TODO: we shoudld *really* check for errors here...
  if ( channel != -1 ) {
   tu16 = channel;
-  roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXSCHAN, &tu16);
+  if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXSCHAN, &tu16) == -1 ) {
+   streams_delete(stream);
+   if ( prim ) alive = 0;
+   ROAR_ERR("add_output(drv='%s', dev='%s', opts='%s'): can not set DMX channel number.", drv, dev, opts);
+   ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
+   return -1;
+  }
  }
  if ( universe != -1 ) {
   tu16 = universe;
-  roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXUNIV, &tu16);
+  if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXUNIV, &tu16) == -1 ) {
+   streams_delete(stream);
+   if ( prim ) alive = 0;
+   ROAR_ERR("add_output(drv='%s', dev='%s', opts='%s'): can not set DMX universe.", drv, dev, opts);
+   ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
+   return -1;
+  }
  }