comparison src/nas.c @ 263:727739f917cb r20-5b30

Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 6a378aca36af
children c5d627a313b1
comparison
equal deleted inserted replaced
262:9d8607af9e13 263:727739f917cb
344 signal (SIGPIPE, old_sigpipe); 344 signal (SIGPIPE, old_sigpipe);
345 return 0; 345 return 0;
346 } 346 }
347 #endif 347 #endif
348 348
349 if (aud==NULL) 349 if (aud==NULL) {
350 if (aud_server != NULL) 350 if (aud_server != NULL)
351 { 351 {
352 char *m; 352 char *m;
353 /* attempt to reconect */ 353 /* attempt to reconect */
354 if ((m=init_play (aud_server))!= NULL) 354 if ((m=init_play (aud_server))!= NULL)
366 #ifdef ROBUST_PLAY 366 #ifdef ROBUST_PLAY
367 signal (SIGPIPE, old_sigpipe); 367 signal (SIGPIPE, old_sigpipe);
368 #endif 368 #endif
369 return 0; 369 return 0;
370 } 370 }
371 }
371 372
372 #ifndef CACHE_SOUNDS 373 #ifndef CACHE_SOUNDS
373 sounds_in_play++; 374 sounds_in_play++;
374 AuSoundPlayFromFile (aud, 375 AuSoundPlayFromFile (aud,
375 sound_file, 376 sound_file,
443 return 0; 444 return 0;
444 } 445 }
445 #endif 446 #endif
446 447
447 448
448 if (aud == NULL) 449 if (aud == NULL) {
449 if (aud_server != NULL) 450 if (aud_server != NULL)
450 { 451 {
451 char *m; 452 char *m;
452 /* attempt to reconect */ 453 /* attempt to reconect */
453 if ((m = init_play (aud_server)) != NULL) 454 if ((m = init_play (aud_server)) != NULL)
464 #ifdef ROBUST_PLAY 465 #ifdef ROBUST_PLAY
465 signal (SIGPIPE, old_sigpipe); 466 signal (SIGPIPE, old_sigpipe);
466 #endif 467 #endif
467 return 0; 468 return 0;
468 } 469 }
470 }
469 471
470 if ((s=SoundOpenDataForReading (data, length))==NULL) 472 if ((s=SoundOpenDataForReading (data, length))==NULL)
471 { 473 {
472 warn ("unknown sound type"); 474 warn ("unknown sound type");
473 #ifdef ROBUST_PLAY 475 #ifdef ROBUST_PLAY