Changeset 5238:5117fb0e7ed4 in roaraudio for libroar/stream.c
- Timestamp:
- 11/12/11 17:41:13 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/stream.c
r5229 r5238 36 36 #include "libroar.h" 37 37 38 int roar_stream_connect (struct roar_connection * con, struct roar_stream * s, int dir) { 39 return roar_stream_connect2(con, s, dir, -1); 40 } 41 42 int roar_stream_connect2 (struct roar_connection * con, struct roar_stream * s, int dir, int mixer) { 38 int roar_stream_connect(struct roar_connection * con, struct roar_stream * s, int dir, int mixer) { 43 39 struct roar_libroar_config * config = roar_libroar_get_config(); 44 40 struct roar_stream ms; … … 380 376 } 381 377 382 int roar_stream_add_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len) {383 struct roar_message m;384 385 if ( con == NULL || s == NULL || data == NULL ) {386 roar_err_set(ROAR_ERROR_FAULT);387 return -1;388 }389 390 memset(&m, 0, sizeof(m));391 392 m.cmd = ROAR_CMD_ADD_DATA;393 m.stream = s->id;394 m.pos = 0;395 m.datalen = len;396 397 // if ( roar_req(con, &m, (void**)&data) == -1 )398 // return -1;399 if ( roar_send_message(con, &m, data) != 0 )400 return -1;401 402 if ( roar_recv_message(con, &m, NULL) == -1 )403 return -1;404 405 if ( m.cmd == ROAR_CMD_OK )406 return 0;407 return -1;408 }409 410 int roar_stream_send_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len) {411 412 roar_debug_warn_obsolete("roar_stream_send_data", "roar_vio_write", NULL);413 414 if ( s == NULL ) {415 roar_err_set(ROAR_ERROR_FAULT);416 return -1;417 }418 419 if ( s->fh == -1 ) {420 if ( con == NULL ) {421 roar_err_set(ROAR_ERROR_NOTSUP);422 return -1;423 }424 425 if ( roar_stream_add_data(con, s, data, len) == -1 )426 return -1;427 428 return len;429 }430 431 #ifdef ROAR_HAVE_IO_POSIX432 return ROAR_NETWORK_WRITE(s->fh, data, len);433 #endif434 435 roar_err_set(ROAR_ERROR_NOTSUP);436 return -1;437 }438 439 378 int roar_stream_get_info (struct roar_connection * con, struct roar_stream * s, struct roar_stream_info * info) { 440 379 struct roar_message m; … … 709 648 710 649 711 int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, int flags, int reset) { 712 return roar_stream_set_flags2(con, s, flags, reset == ROAR_RESET_FLAG ? ROAR_RESET_FLAG : ROAR_SET_FLAG); 713 } 714 715 int roar_stream_set_flags2 (struct roar_connection * con, struct roar_stream * s, uint32_t flags, int action) { 650 int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, uint32_t flags, int action) { 716 651 struct roar_message m; 717 652 uint16_t * data = (uint16_t *) m.data;
Note: See TracChangeset
for help on using the changeset viewer.