Changeset 5242:97239101cee9 in roaraudio for roard/output.c
- Timestamp:
- 11/13/11 00:03:27 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/output.c
r5210 r5242 460 460 _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM, s)); // ignore errors here 461 461 462 if ( blocks != -1 ) 463 roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLOCKS, &blocks); 464 465 if ( blocksize != -1 ) 466 roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLKSIZE, &blocksize); 462 if ( blocks != -1 ) { 463 if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLOCKS, &blocks) == -1 ) { 464 ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s'): can not set number of blocks.", drv, dev, opts); 465 } 466 } 467 468 if ( blocksize != -1 ) { 469 if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLKSIZE, &blocksize) == -1 ) { 470 ROAR_WARN("add_output(drv='%s', dev='%s', opts='%s'): can not set blocksize.", drv, dev, opts); 471 } 472 } 467 473 468 474 // TODO: we shoudld *really* check for errors here... 469 475 if ( channel != -1 ) { 470 476 tu16 = channel; 471 roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXSCHAN, &tu16); 477 if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXSCHAN, &tu16) == -1 ) { 478 streams_delete(stream); 479 if ( prim ) alive = 0; 480 ROAR_ERR("add_output(drv='%s', dev='%s', opts='%s'): can not set DMX channel number.", drv, dev, opts); 481 ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts); 482 return -1; 483 } 472 484 } 473 485 if ( universe != -1 ) { 474 486 tu16 = universe; 475 roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXUNIV, &tu16); 487 if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DMXUNIV, &tu16) == -1 ) { 488 streams_delete(stream); 489 if ( prim ) alive = 0; 490 ROAR_ERR("add_output(drv='%s', dev='%s', opts='%s'): can not set DMX universe.", drv, dev, opts); 491 ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts); 492 return -1; 493 } 476 494 } 477 495
Note: See TracChangeset
for help on using the changeset viewer.