Mercurial > hg > xemacs-beta
comparison src/miscplay.c @ 564:001628b7a5b3
[xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
Fix broken build on Linux.
* buffer.c (Qtext_conversion_error): Moved from file-coding.c
so that --with-file-coding=no will compile corectly.
* buffer.c (syms_of_buffer): Define Qtext_conversion_error.
Also moved from file-coding.c
* file-coding.c (Qtext_conversion_error): Moved to buffer.c
* file-coding.c (syms_of_file_coding): Moved Qtext_conversion_error
initialization to buffer.c
* emodules.c (Qdll_error): New error.
* emodules.c (syms_of_module): Declare Qdll_error.
* esd.c (esd_play_sound_data): sound_warn accepts only one arg.
* miscplay.c (sndcnv8S_2mono):
* miscplay.c (sndcnv2monounsigned):
* miscplay.c (int2ulaw):
* miscplay.c (sndcnv2byteLE):
* miscplay.c (sndcnv2byteBE):
* miscplay.c (sndcnv2monobyteLE):
* miscplay.c (sndcnv2monobyteBE): Replace signed Char_Binary with
Char_Binary. There's no type called signed char in C.
Also remove audio: from error message. sound_warn and sound_perror
prepends them.
author | yoshiki |
---|---|
date | Thu, 24 May 2001 09:37:30 +0000 |
parents | 183866b06e0b |
children | db376c5066a7 |
comparison
equal
deleted
inserted
replaced
563:183866b06e0b | 564:001628b7a5b3 |
---|---|
384 src = (UChar_Binary *) *data; | 384 src = (UChar_Binary *) *data; |
385 *outbuf = | 385 *outbuf = |
386 dest = miscplay_sndbuf; | 386 dest = miscplay_sndbuf; |
387 while (count--) | 387 while (count--) |
388 { | 388 { |
389 *dest++ = (UChar_Binary)(((int)*((signed Char_Binary *)(src)) + | 389 *dest++ = (UChar_Binary)(((int)*((Char_Binary *)(src)) + |
390 (int)*((signed Char_Binary *)(src+1))) / 2); | 390 (int)*((Char_Binary *)(src+1))) / 2); |
391 src += 2; | 391 src += 2; |
392 } | 392 } |
393 *data = src; | 393 *data = src; |
394 return(rc); | 394 return(rc); |
395 } | 395 } |
408 src = (UChar_Binary *) *data; | 408 src = (UChar_Binary *) *data; |
409 *outbuf = | 409 *outbuf = |
410 dest = miscplay_sndbuf; | 410 dest = miscplay_sndbuf; |
411 while (count--) | 411 while (count--) |
412 { | 412 { |
413 *dest++ = (UChar_Binary)(((int)*((signed Char_Binary *)(src)) + | 413 *dest++ = (UChar_Binary)(((int)*((Char_Binary *)(src)) + |
414 (int)*((signed Char_Binary *)(src+1))) / 2) ^ 0x80; | 414 (int)*((Char_Binary *)(src+1))) / 2) ^ 0x80; |
415 src += 2; | 415 src += 2; |
416 } | 416 } |
417 *data = src; | 417 *data = src; |
418 return(rc); | 418 return(rc); |
419 } | 419 } |
438 return(rc); | 438 return(rc); |
439 } | 439 } |
440 | 440 |
441 /* Convert a number in the range -32768..32767 to an 8 bit ulaw encoded | 441 /* Convert a number in the range -32768..32767 to an 8 bit ulaw encoded |
442 number --- I hope, I got this conversion right :-) */ | 442 number --- I hope, I got this conversion right :-) */ |
443 static inline signed Char_Binary int2ulaw(int i) | 443 static inline Char_Binary int2ulaw(int i) |
444 { | 444 { |
445 /* Lookup table for fast calculation of number of bits that need shifting*/ | 445 /* Lookup table for fast calculation of number of bits that need shifting*/ |
446 static short int t_bits[128] = { | 446 static short int t_bits[128] = { |
447 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, | 447 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, |
448 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | 448 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, |
662 rc = count; | 662 rc = count; |
663 src = (UChar_Binary *) *data; | 663 src = (UChar_Binary *) *data; |
664 *outbuf = | 664 *outbuf = |
665 dest = miscplay_sndbuf; | 665 dest = miscplay_sndbuf; |
666 while (count--) { | 666 while (count--) { |
667 *dest++ = (UChar_Binary)(((signed Char_Binary *)src)[1] ^ (signed Char_Binary)0x80); | 667 *dest++ = (UChar_Binary)(((Char_Binary *)src)[1] ^ (Char_Binary)0x80); |
668 src += 2; | 668 src += 2; |
669 } | 669 } |
670 *data = src; | 670 *data = src; |
671 return(rc); | 671 return(rc); |
672 } | 672 } |
684 rc = count; | 684 rc = count; |
685 src = (UChar_Binary *) *data; | 685 src = (UChar_Binary *) *data; |
686 *outbuf = | 686 *outbuf = |
687 dest = miscplay_sndbuf; | 687 dest = miscplay_sndbuf; |
688 while (count--) { | 688 while (count--) { |
689 *dest++ = (UChar_Binary)(((signed Char_Binary *)src)[0] ^ (signed Char_Binary)0x80); | 689 *dest++ = (UChar_Binary)(((Char_Binary *)src)[0] ^ (Char_Binary)0x80); |
690 src += 2; | 690 src += 2; |
691 } | 691 } |
692 *data = src; | 692 *data = src; |
693 return(rc); | 693 return(rc); |
694 } | 694 } |
707 rc = count; | 707 rc = count; |
708 src = (UChar_Binary *) *data; | 708 src = (UChar_Binary *) *data; |
709 *outbuf = | 709 *outbuf = |
710 dest = miscplay_sndbuf; | 710 dest = miscplay_sndbuf; |
711 while (count--) { | 711 while (count--) { |
712 *dest++ = (UChar_Binary)(((int)((signed Char_Binary *)src)[1] + | 712 *dest++ = (UChar_Binary)(((int)((Char_Binary *)src)[1] + |
713 (int)((signed Char_Binary *)src)[3]) / 2 ^ 0x80); | 713 (int)((Char_Binary *)src)[3]) / 2 ^ 0x80); |
714 src += 4; | 714 src += 4; |
715 } | 715 } |
716 *data = src; | 716 *data = src; |
717 return(rc); | 717 return(rc); |
718 } | 718 } |
731 rc = count; | 731 rc = count; |
732 src = (UChar_Binary *) *data; | 732 src = (UChar_Binary *) *data; |
733 *outbuf = | 733 *outbuf = |
734 dest = miscplay_sndbuf; | 734 dest = miscplay_sndbuf; |
735 while (count--) { | 735 while (count--) { |
736 *dest++ = (UChar_Binary)(((int)((signed Char_Binary *)src)[0] + | 736 *dest++ = (UChar_Binary)(((int)((Char_Binary *)src)[0] + |
737 (int)((signed Char_Binary *)src)[2]) / 2 ^ 0x80); | 737 (int)((Char_Binary *)src)[2]) / 2 ^ 0x80); |
738 src += 4; | 738 src += 4; |
739 } | 739 } |
740 *data = src; | 740 *data = src; |
741 return(rc); | 741 return(rc); |
742 } | 742 } |