Changeset 4909:6f58c1773cd0 in roaraudio for roarclients
- Timestamp:
- 05/07/11 17:09:13 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarinterconnect.c
r4885 r4909 26 26 /* ckport options: 27 27 * ckport: ignore: ^roar_cdriver_oss$ -- For OSS streams 28 * ckport: ignore: ^roar_simple_stream$ -- For RoarAudio streams29 * ckport: ignore: ^roar_socket_connect$ -- For PulseAudio Simple streams30 28 */ 31 29 … … 244 242 struct roar_connection con[1]; 245 243 struct roar_stream stream[1]; 244 struct roar_vio_calls vio; 246 245 #ifdef _HAVE_OSS 247 struct roar_vio_calls vio;248 246 struct roar_audio_info info; 249 247 #endif … … 316 314 return 2; 317 315 } 318 rfh = roar_simple_stream(rate, channels, bits, codec, remote, tmp, "roarinterconnect"); 316 if ( roar_vio_simple_stream(&vio, rate, channels, bits, codec, remote, tmp, "roarinterconnect") == -1 ) { 317 fprintf(stderr, "Error: can not open RoarAudio stream to %s: %s\n", remote, roar_error2str(roar_error)); 318 return 2; 319 } 320 if ( roar_vio_ctl(&vio, ROAR_VIO_CTL_GET_FH, &rfh) == -1 ) { 321 fprintf(stderr, "Error: can not get filehandle for RoarAudio stream: %s\n", roar_error2str(roar_error)); 322 roar_vio_close(&vio); 323 return 2; 324 } 319 325 break; 320 326 #ifdef _HAVE_OSS … … 341 347 info.codec = codec; 342 348 if ( roar_cdriver_oss(&vio, "OSS", remote, &info, tmp) == -1 ) { 343 fprintf(stderr, "Error: can not open OSS device %s \n", remote);349 fprintf(stderr, "Error: can not open OSS device %s: %s\n", remote, roar_error2str(roar_error)); 344 350 return 2; 345 351 } 346 352 if ( roar_vio_ctl(&vio, ROAR_VIO_CTL_GET_FH, &rfh) == -1 ) { 353 fprintf(stderr, "Error: can not get filehandle for OSS device %s: %s\n", remote, roar_error2str(roar_error)); 347 354 roar_vio_close(&vio); 348 fprintf(stderr, "Error: can not get filehandle for OSS device %s\n", remote);349 355 return 2; 350 356 } … … 452 458 rport = atoi(k); 453 459 } else { 454 rport = 4712; 455 } 456 rfh = roar_socket_connect(remote, rport); 460 rport = ROAR_DEFAULT_PA_PORT; 461 } 462 463 if ( roar_vio_open_socket(&vio, remote, rport) == -1 ) { 464 fprintf(stderr, "Error: can not open socket for Simple stream: %s\n", roar_error2str(roar_error)); 465 return 2; 466 } 467 468 roar_vio_shutdown(&vio, tmp); 469 470 if ( roar_vio_ctl(&vio, ROAR_VIO_CTL_GET_FH, &rfh) == -1 ) { 471 fprintf(stderr, "Error: can not get filehandle for Simple stream: %s\n", roar_error2str(roar_error)); 472 roar_vio_close(&vio); 473 return 2; 474 } 475 /* 457 476 if ( tmp != -1 ) { 458 477 ROAR_SHUTDOWN(rfh, tmp); 459 478 } 479 */ 460 480 break; 461 481 default: … … 489 509 } 490 510 491 roar_simple_close(rfh); 511 switch (type & MT_MASK) { 512 case MT_ESD: 513 close(rfh); 514 break; 515 case MT_RSOUND: 516 roar_vio_open_fh_socket(&vio, rfh); 517 case MT_ROAR: 518 case MT_OSS: 519 case MT_SIMPLE: 520 roar_vio_close(&vio); 521 break; 522 default: 523 close(rfh); 524 } 492 525 493 526 if ( roar_stream_attach_simple(con, stream, 0) == -1 ) {
Note: See TracChangeset
for help on using the changeset viewer.