diff options
Diffstat (limited to 'audio/maplay')
20 files changed, 344 insertions, 527 deletions
diff --git a/audio/maplay/files/patch-Makefile b/audio/maplay/files/patch-Makefile index 2b8bd0fe7c96..7c121ece4f73 100644 --- a/audio/maplay/files/patch-Makefile +++ b/audio/maplay/files/patch-Makefile @@ -1,47 +1,27 @@ -*** Makefile.orig Thu Jun 23 21:14:46 1994 ---- Makefile Thu Dec 9 06:09:27 1999 -*************** -*** 27,33 **** - # - - -! CFLAGS = $(COMPILERFLAGS) - # debugging: -ggdb -DDEBUG - # profiling: -pg (gprof) or -p (prof) - # strip command has to be removed for debugging or profiling ---- 27,33 ---- - # - - -! CFLAGS += $(COMPILERFLAGS) - # debugging: -ggdb -DDEBUG - # profiling: -pg (gprof) or -p (prof) - # strip command has to be removed for debugging or profiling -*************** -*** 39,52 **** - - .SUFFIXES: .cc - -! install: - @./configuration.sh - -- all: maplay -- - maplay: $(OBJS) - $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm -- -strip $@ - - .cc.o: - $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ ---- 39,49 ---- - - .SUFFIXES: .cc - -! all: - @./configuration.sh - - maplay: $(OBJS) - $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm - - .cc.o: - $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ +--- Makefile.orig 1994-06-23 12:14:46 UTC ++++ Makefile +@@ -27,7 +27,7 @@ + # + + +-CFLAGS = $(COMPILERFLAGS) ++CFLAGS += $(COMPILERFLAGS) + # debugging: -ggdb -DDEBUG + # profiling: -pg (gprof) or -p (prof) + # strip command has to be removed for debugging or profiling +@@ -39,14 +39,11 @@ OBJS = maplay.o ibitstream.o header.o sc + + .SUFFIXES: .cc + +-install: ++all: + @./configuration.sh + +-all: maplay +- + maplay: $(OBJS) + $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm +- -strip $@ + + .cc.o: + $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ diff --git a/audio/maplay/files/patch-all.h b/audio/maplay/files/patch-all.h index 05e126e58b21..65eb467c28e3 100644 --- a/audio/maplay/files/patch-all.h +++ b/audio/maplay/files/patch-all.h @@ -1,19 +1,11 @@ -*** all.h.orig Thu Jun 23 21:14:39 1994 ---- all.h Thu Dec 9 05:32:18 1999 -*************** -*** 22,28 **** - #define ALL_H - - typedef float real; // float should be enough -! typedef short bool; - typedef unsigned uint32; // 32 Bit unsigned integer - // some compilers may need "typedef unsigned long uint32" instead - typedef int int32; // 32 Bit signed integer ---- 22,28 ---- - #define ALL_H - - typedef float real; // float should be enough -! typedef short boolean; - typedef unsigned uint32; // 32 Bit unsigned integer - // some compilers may need "typedef unsigned long uint32" instead - typedef int int32; // 32 Bit signed integer +--- all.h.orig 1994-06-23 12:14:39 UTC ++++ all.h +@@ -22,7 +22,7 @@ + #define ALL_H + + typedef float real; // float should be enough +-typedef short bool; ++typedef short boolean; + typedef unsigned uint32; // 32 Bit unsigned integer + // some compilers may need "typedef unsigned long uint32" instead + typedef int int32; // 32 Bit signed integer diff --git a/audio/maplay/files/patch-configuration.sh b/audio/maplay/files/patch-configuration.sh index c60df37ab9b4..413230ebe0b9 100644 --- a/audio/maplay/files/patch-configuration.sh +++ b/audio/maplay/files/patch-configuration.sh @@ -1,32 +1,25 @@ -*** configuration.sh.orig Thu Jun 23 21:14:46 1994 ---- configuration.sh Thu Dec 9 05:21:02 1999 -*************** -*** 72,77 **** ---- 72,87 ---- - INCLUDEDIRS= - LIBRARIES= - AUDIO_INCLUDES='#include <sys/audioio.h>' ;; -+ FreeBSD*) -+ COMPILER='${CXX}' -+ if [ ${ARCH} = "i386" ]; then -+ COMPILERFLAGS='-DLINUX -DDAMN_INTEL_BYTE_ORDER' -+ else -+ COMPILERFLAGS='-DLINUX' -+ fi -+ INCLUDEDIRS= -+ LIBRARIES= -+ AUDIO_INCLUDES='#include <sys/soundcard.h>' ;; - Linux*) - COMPILER=g++ - COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' -*************** -*** 95,98 **** - echo $AUDIO_INCLUDES >audio_includes.h - fi - -! make all ---- 105,108 ---- - echo $AUDIO_INCLUDES >audio_includes.h - fi - -! make maplay +--- configuration.sh.orig 1994-06-23 12:14:46 UTC ++++ configuration.sh +@@ -72,6 +72,16 @@ case `uname -sr` in + INCLUDEDIRS= + LIBRARIES= + AUDIO_INCLUDES='#include <sys/audioio.h>' ;; ++ FreeBSD*) ++ COMPILER='${CXX}' ++ if [ ${ARCH} = "i386" ]; then ++ COMPILERFLAGS='-DLINUX -DDAMN_INTEL_BYTE_ORDER' ++ else ++ COMPILERFLAGS='-DLINUX' ++ fi ++ INCLUDEDIRS= ++ LIBRARIES= ++ AUDIO_INCLUDES='#include <sys/soundcard.h>' ;; + Linux*) + COMPILER=g++ + COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' +@@ -95,4 +105,4 @@ if [ ! -f audio_includes.h ]; then + echo $AUDIO_INCLUDES >audio_includes.h + fi + +-make all ++make maplay diff --git a/audio/maplay/files/patch-crc.cc b/audio/maplay/files/patch-crc.cc index 909f2e3255b0..a696e814000e 100644 --- a/audio/maplay/files/patch-crc.cc +++ b/audio/maplay/files/patch-crc.cc @@ -1,5 +1,5 @@ ---- crc.cc.orig Thu Nov 21 16:44:18 2002 -+++ crc.cc Thu Nov 21 16:44:30 2002 +--- crc.cc.orig 1994-06-23 12:14:35 UTC ++++ crc.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -9,7 +9,7 @@ #include <stdlib.h> #include "crc.h" -@@ -32,7 +32,7 @@ +@@ -32,7 +32,7 @@ void Crc16::add_bits (uint32 bitstring, #ifdef DEBUG if (!length) { diff --git a/audio/maplay/files/patch-header.cc b/audio/maplay/files/patch-header.cc index cf3ef91f6e41..2aa843b5a4fe 100644 --- a/audio/maplay/files/patch-header.cc +++ b/audio/maplay/files/patch-header.cc @@ -1,5 +1,5 @@ ---- header.cc.orig Thu Jun 23 22:14:35 1994 -+++ header.cc Thu Nov 21 16:42:47 2002 +--- header.cc.orig 1994-06-23 12:14:35 UTC ++++ header.cc @@ -20,15 +20,15 @@ /* @@ -29,7 +29,7 @@ { uint32 headerstring; -@@ -45,41 +45,41 @@ +@@ -45,41 +45,41 @@ bool Header::read_header (Ibitstream *st if ((headerstring & 0xFFF80000) != 0xFFF80000) { @@ -81,7 +81,7 @@ exit (1); } h_padding_bit = (headerstring >> 9) & 1; -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ bool Header::read_header (Ibitstream *st h_mode != single_channel) || (h_bitrate_index >= 11 && h_mode == single_channel)) { @@ -90,7 +90,7 @@ " mode: " << mode_string () << "\n bitrate: " << bitrate_string () << '\n'; exit (1); -@@ -161,7 +161,7 @@ +@@ -161,7 +161,7 @@ uint32 Header::calculate_framesize () static const int32 bitrates_layer_2[15] = { 0 /*free format*/, 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000 }; diff --git a/audio/maplay/files/patch-header.h b/audio/maplay/files/patch-header.h index 342deecaf589..be0a83a8c978 100644 --- a/audio/maplay/files/patch-header.h +++ b/audio/maplay/files/patch-header.h @@ -1,61 +1,36 @@ -*** header.h.orig Thu Jun 23 21:14:40 1994 ---- header.h Thu Dec 9 05:45:44 1999 -*************** -*** 39,45 **** - e_mode h_mode; - e_sample_frequency h_sample_frequency; - uint32 h_number_of_subbands, h_intensity_stereo_bound; -! bool h_copyright, h_original; - Crc16 *crc; - uint16 checksum; - ---- 39,45 ---- - e_mode h_mode; - e_sample_frequency h_sample_frequency; - uint32 h_number_of_subbands, h_intensity_stereo_bound; -! boolean h_copyright, h_original; - Crc16 *crc; - uint16 checksum; - -*************** -*** 48,54 **** - public: - Header (void) { crc = (Crc16 *)0; } - ~Header (void) { if (crc) delete crc; } -! bool read_header (Ibitstream *, Crc16 **); - // read a 32-bit header from the bitstream - - // functions to query header contents: ---- 48,54 ---- - public: - Header (void) { crc = (Crc16 *)0; } - ~Header (void) { if (crc) delete crc; } -! boolean read_header (Ibitstream *, Crc16 **); - // read a 32-bit header from the bitstream - - // functions to query header contents: -*************** -*** 58,68 **** - uint32 frequency (void) { return frequencies[h_sample_frequency]; } - static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } - e_mode mode (void) { return h_mode; }; -! bool checksums (void) { return !h_protection_bit; } -! bool copyright (void) { return h_copyright; } -! bool original (void) { return h_original; } - -! bool checksum_ok (void) { return checksum == crc->checksum (); } - // compares computed checksum with stream checksum - - // functions which return header informations as strings: ---- 58,68 ---- - uint32 frequency (void) { return frequencies[h_sample_frequency]; } - static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } - e_mode mode (void) { return h_mode; }; -! boolean checksums (void) { return !h_protection_bit; } -! boolean copyright (void) { return h_copyright; } -! boolean original (void) { return h_original; } - -! boolean checksum_ok (void) { return checksum == crc->checksum (); } - // compares computed checksum with stream checksum - - // functions which return header informations as strings: +--- header.h.orig 1994-06-23 12:14:40 UTC ++++ header.h +@@ -39,7 +39,7 @@ class Header + e_mode h_mode; + e_sample_frequency h_sample_frequency; + uint32 h_number_of_subbands, h_intensity_stereo_bound; +- bool h_copyright, h_original; ++ boolean h_copyright, h_original; + Crc16 *crc; + uint16 checksum; + +@@ -48,7 +48,7 @@ class Header + public: + Header (void) { crc = (Crc16 *)0; } + ~Header (void) { if (crc) delete crc; } +- bool read_header (Ibitstream *, Crc16 **); ++ boolean read_header (Ibitstream *, Crc16 **); + // read a 32-bit header from the bitstream + + // functions to query header contents: +@@ -58,11 +58,11 @@ public: + uint32 frequency (void) { return frequencies[h_sample_frequency]; } + static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } + e_mode mode (void) { return h_mode; }; +- bool checksums (void) { return !h_protection_bit; } +- bool copyright (void) { return h_copyright; } +- bool original (void) { return h_original; } ++ boolean checksums (void) { return !h_protection_bit; } ++ boolean copyright (void) { return h_copyright; } ++ boolean original (void) { return h_original; } + +- bool checksum_ok (void) { return checksum == crc->checksum (); } ++ boolean checksum_ok (void) { return checksum == crc->checksum (); } + // compares computed checksum with stream checksum + + // functions which return header informations as strings: diff --git a/audio/maplay/files/patch-ibitstream.cc b/audio/maplay/files/patch-ibitstream.cc index 39e9a19b65cf..b025c7d07328 100644 --- a/audio/maplay/files/patch-ibitstream.cc +++ b/audio/maplay/files/patch-ibitstream.cc @@ -1,5 +1,5 @@ ---- ibitstream.cc.orig Thu Jun 23 22:14:35 1994 -+++ ibitstream.cc Thu Nov 21 16:41:11 2002 +--- ibitstream.cc.orig 1994-06-23 12:14:35 UTC ++++ ibitstream.cc @@ -29,7 +29,7 @@ #include <unistd.h> #include <errno.h> @@ -9,7 +9,7 @@ #include "all.h" #include "ibitstream.h" -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ Ibitstream::Ibitstream (const char *file { if ((fd = open (filename, O_RDONLY, 0)) < 0) { @@ -18,7 +18,7 @@ exit (1); } wordpointer = buffer; -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ Ibitstream::~Ibitstream (void) // des } @@ -27,7 +27,7 @@ { int readvalue; -@@ -102,13 +102,13 @@ +@@ -102,13 +102,13 @@ bool Ibitstream::get_header (uint32 *hea } @@ -43,7 +43,7 @@ exit (1); } -@@ -170,7 +170,7 @@ +@@ -170,7 +170,7 @@ uint32 Ibitstream::get_bits (uint32 numb #ifdef DEBUG if (number_of_bits < 1 || number_of_bits > 16) { @@ -52,7 +52,7 @@ exit (1); } #endif -@@ -184,7 +184,7 @@ +@@ -184,7 +184,7 @@ uint32 Ibitstream::get_bits (uint32 numb bitindex = 0; if ((char *)++wordpointer > (char *)buffer + framesize) { @@ -61,7 +61,7 @@ exit (1); } } -@@ -197,7 +197,7 @@ +@@ -197,7 +197,7 @@ uint32 Ibitstream::get_bits (uint32 numb *(int16 *)&returnvalue = *((int16 *)wordpointer + 1); if ((char *)++wordpointer > (char *)buffer + framesize) { @@ -70,7 +70,7 @@ exit (1); } *((int16 *)&returnvalue + 1) = *(int16 *)wordpointer; -@@ -205,7 +205,7 @@ +@@ -205,7 +205,7 @@ uint32 Ibitstream::get_bits (uint32 numb *((int16 *)&returnvalue + 1) = *(int16 *)wordpointer; if ((char *)++wordpointer > (char *)buffer + framesize) { diff --git a/audio/maplay/files/patch-ibitstream.h b/audio/maplay/files/patch-ibitstream.h index fb92627bd6e6..8da2fbf03bb9 100644 --- a/audio/maplay/files/patch-ibitstream.h +++ b/audio/maplay/files/patch-ibitstream.h @@ -1,25 +1,15 @@ -*** ibitstream.h.orig Thu Jun 23 21:14:40 1994 ---- ibitstream.h Thu Dec 9 05:32:18 1999 -*************** -*** 43,52 **** - ~Ibitstream (void); - int filedescriptor (void) { return fd; }; - -! bool get_header (uint32 *); - // get next 32 bits from bitstream in an unsigned int, - // returned value False => end of stream -! bool read_frame (uint32 bytesize); - // fill buffer with data from bitstream, returned value False => end of stream - uint32 get_bits (uint32 number_of_bits); - // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits ---- 43,52 ---- - ~Ibitstream (void); - int filedescriptor (void) { return fd; }; - -! boolean get_header (uint32 *); - // get next 32 bits from bitstream in an unsigned int, - // returned value False => end of stream -! boolean read_frame (uint32 bytesize); - // fill buffer with data from bitstream, returned value False => end of stream - uint32 get_bits (uint32 number_of_bits); - // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits +--- ibitstream.h.orig 1994-06-23 12:14:40 UTC ++++ ibitstream.h +@@ -43,10 +43,10 @@ public: + ~Ibitstream (void); + int filedescriptor (void) { return fd; }; + +- bool get_header (uint32 *); ++ boolean get_header (uint32 *); + // get next 32 bits from bitstream in an unsigned int, + // returned value False => end of stream +- bool read_frame (uint32 bytesize); ++ boolean read_frame (uint32 bytesize); + // fill buffer with data from bitstream, returned value False => end of stream + uint32 get_bits (uint32 number_of_bits); + // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits diff --git a/audio/maplay/files/patch-maplay.cc b/audio/maplay/files/patch-maplay.cc index efc0b0d38535..e42a69af4179 100644 --- a/audio/maplay/files/patch-maplay.cc +++ b/audio/maplay/files/patch-maplay.cc @@ -1,5 +1,5 @@ ---- maplay.cc.orig 1994-06-23 08:14:36.000000000 -0400 -+++ maplay.cc 2014-07-27 09:22:27.000000000 -0400 +--- maplay.cc.orig 1994-06-23 12:14:36 UTC ++++ maplay.cc @@ -39,8 +39,8 @@ #include <stdlib.h> #include <string.h> @@ -34,7 +34,7 @@ static real scalefactor; // data extracted from header of first frame: -@@ -90,15 +89,15 @@ +@@ -90,15 +89,15 @@ static void Exit (int returncode) } @@ -53,7 +53,7 @@ << " [-v] [-s] [-l] [-r] " #ifdef SPARC "[-us] [-uh] " -@@ -146,6 +145,9 @@ +@@ -146,6 +145,9 @@ usage: #ifdef Solaris "SPARC Solaris 2.x" #else @@ -63,7 +63,7 @@ #ifdef LINUX "Linux" #else -@@ -159,6 +161,7 @@ +@@ -159,6 +161,7 @@ usage: #endif #endif #endif @@ -71,7 +71,7 @@ " version)\n" "@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de)\n" "@(#) Berlin University of Technology\n" -@@ -216,7 +219,7 @@ +@@ -216,7 +219,7 @@ usage: case 'f': if (++i == argc) { @@ -80,7 +80,7 @@ exit (1); } use_own_scalefactor = True; -@@ -243,7 +246,7 @@ +@@ -243,7 +246,7 @@ usage: header = new Header; if (!header->read_header (stream, &crc)) { @@ -89,7 +89,7 @@ Exit (1); } -@@ -328,7 +331,7 @@ +@@ -328,7 +331,7 @@ usage: // } //#else { @@ -98,7 +98,7 @@ "Please use the stdout mode.\n"; Exit (0); } -@@ -345,22 +348,22 @@ +@@ -345,22 +348,22 @@ usage: ++name; else name = filename; @@ -129,7 +129,7 @@ } do -@@ -371,20 +374,20 @@ +@@ -371,20 +374,20 @@ usage: { // layer switching is allowed if (verbose_mode) @@ -153,7 +153,7 @@ Exit (1); } -@@ -423,7 +426,7 @@ +@@ -423,7 +426,7 @@ usage: } else { @@ -162,7 +162,7 @@ Exit (0); } -@@ -463,7 +466,7 @@ +@@ -463,7 +466,7 @@ usage: } else // Sh*t! Wrong crc checksum in frame! @@ -171,7 +171,7 @@ for (i = 0; i < header->number_of_subbands (); ++i) delete subbands[i]; -@@ -481,18 +484,18 @@ +@@ -481,18 +484,18 @@ usage: // check whether (one of) the filter(s) produced values not in [-1.0, 1.0]: if (range_violations) { @@ -197,7 +197,7 @@ } } if (verbose_mode) -@@ -502,13 +505,13 @@ +@@ -502,13 +505,13 @@ usage: uint32 minutes = (uint32)(playtime / 60.0); uint32 seconds = (uint32)playtime - minutes * 60; uint32 centiseconds = (uint32)((playtime - (real)(minutes * 60) - (real)seconds) * 100.0); diff --git a/audio/maplay/files/patch-obuffer.cc b/audio/maplay/files/patch-obuffer.cc index 84acbef6212f..e1beded33c34 100644 --- a/audio/maplay/files/patch-obuffer.cc +++ b/audio/maplay/files/patch-obuffer.cc @@ -1,5 +1,5 @@ ---- obuffer.cc.orig Mon Jun 27 21:14:03 1994 -+++ obuffer.cc Thu Nov 21 16:45:14 2002 +--- obuffer.cc.orig 1994-06-27 11:14:03 UTC ++++ obuffer.cc @@ -47,7 +47,7 @@ #include <unistd.h> #include <fcntl.h> @@ -9,7 +9,7 @@ #include "obuffer.h" #include "header.h" #ifdef ULAW -@@ -65,14 +65,14 @@ +@@ -65,14 +65,14 @@ FileObuffer::FileObuffer (uint32 number_ #ifdef DEBUG if (!number_of_channels || number_of_channels > MAXCHANNELS) { @@ -26,7 +26,7 @@ #endif channels = number_of_channels; for (int i = 0; i < number_of_channels; ++i) -@@ -85,12 +85,12 @@ +@@ -85,12 +85,12 @@ void FileObuffer::append (uint32 channel #ifdef DEBUG if (channel >= channels) { @@ -41,7 +41,7 @@ exit (1); } #endif -@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@ IndigoObuffer::IndigoObuffer (uint32 num #ifdef DEBUG if (!number_of_channels || number_of_channels > MAXCHANNELS) { @@ -50,7 +50,7 @@ exit (1); } #endif -@@ -155,7 +155,7 @@ +@@ -155,7 +155,7 @@ IndigoObuffer::IndigoObuffer (uint32 num ALconfig config; if (!(config = ALnewconfig ())) { @@ -59,7 +59,7 @@ exit (1); } ALsetwidth (config, AL_SAMPLE_16); -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ IndigoObuffer::IndigoObuffer (uint32 num ALsetchannels (config, AL_STEREO); if (!(port = ALopenport ("MPEG audio player", "w", config))) { @@ -68,7 +68,7 @@ exit (1); } -@@ -190,12 +190,12 @@ +@@ -190,12 +190,12 @@ void IndigoObuffer::append (uint32 chann #ifdef DEBUG if (channel >= channels) { @@ -83,7 +83,7 @@ exit (1); } #endif -@@ -217,17 +217,17 @@ +@@ -217,17 +217,17 @@ void IndigoObuffer::write_buffer (int) int SparcObuffer::audio_fd = -1; #ifdef ULAW @@ -104,7 +104,7 @@ exit (1); } #endif -@@ -235,7 +235,7 @@ +@@ -235,7 +235,7 @@ SparcObuffer::SparcObuffer (uint32 numbe if (audio_fd < 0) { @@ -113,7 +113,7 @@ "by SparcObuffer::class_suitable()!\n"; exit (1); } -@@ -296,7 +296,7 @@ +@@ -296,7 +296,7 @@ void SparcObuffer::append (uint32 channe #ifdef DEBUG if (bufferp - buffer >= OBUFFERSIZE >> 1) { @@ -122,7 +122,7 @@ exit (1); } #endif -@@ -307,12 +307,12 @@ +@@ -307,12 +307,12 @@ void SparcObuffer::append (uint32 channe #ifdef DEBUG if (channel >= channels) { @@ -137,7 +137,7 @@ exit (1); } #endif -@@ -351,7 +351,7 @@ +@@ -351,7 +351,7 @@ int SparcObuffer::open_audio_device (voi if ((fd = open ("/dev/audio", O_WRONLY | O_NDELAY, 0)) < 0) if (errno == EBUSY) { @@ -146,7 +146,7 @@ exit (1); } else -@@ -398,7 +398,7 @@ +@@ -398,7 +398,7 @@ int SparcObuffer::get_device_type (int f } return devtype; #else @@ -155,7 +155,7 @@ return -1; #endif } -@@ -406,15 +406,15 @@ +@@ -406,15 +406,15 @@ int SparcObuffer::get_device_type (int f #ifdef ULAW @@ -174,7 +174,7 @@ "Please use the option -l or -r for stereo streams.\n"; return False; } -@@ -436,7 +436,7 @@ +@@ -436,7 +436,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (!strcmp (devtype.name, "SUNW,dbri")) { @@ -183,7 +183,7 @@ "but this binary was compiled for 8 kHz u-law ouput. (telephone quality)\n" "Please recompile it without the ULAW define in COMPILERFLAGS.\n" "(or use the -amd option to use this binary with low-quality output)\n"; -@@ -448,7 +448,7 @@ +@@ -448,7 +448,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (!strcmp (devtype.name, "SUNW,am79c30")) { @@ -192,7 +192,7 @@ "but this binary was compiled for CD-quality output.\n" "Please recompile it with ULAW defined in COMPILERFLAGS\n" "or use it in stdout mode as an decoder only.\n"; -@@ -464,7 +464,7 @@ +@@ -464,7 +464,7 @@ bool SparcObuffer::class_suitable (void) # ifdef ULAW return True; # else @@ -201,7 +201,7 @@ "but this binary was compiled for CD-quality output.\n" "Please recompile it with ULAW defined in COMPILERFLAGS\n" "or use it in stdout mode as an decoder only.\n"; -@@ -479,7 +479,7 @@ +@@ -479,7 +479,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (device_type == AUDIO_DEV_SPEAKERBOX) { @@ -210,7 +210,7 @@ "but this binary was compiled for 8 kHz u-law ouput. (telephone quality)\n" "Please recompile it without the ULAW define in COMPILERFLAGS.\n" "(or use the -amd option to use this binary with low-quality output)\n"; -@@ -491,7 +491,7 @@ +@@ -491,7 +491,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (device_type == AUDIO_DEV_AMD) { @@ -219,7 +219,7 @@ "but this binary was compiled for CD-quality output.\n" "Please recompile it with ULAW defined in COMPILERFLAGS\n" "or use it in stdout mode as an decoder only.\n"; -@@ -504,7 +504,7 @@ +@@ -504,7 +504,7 @@ bool SparcObuffer::class_suitable (void) #ifndef SunOS4_1_1 close (audio_fd); @@ -228,7 +228,7 @@ # ifdef ULAW "Please try the -amd option or use the stdout mode.\n"; # else -@@ -527,7 +527,7 @@ +@@ -527,7 +527,7 @@ int LinuxObuffer::open_audio_device (voi if ((fd = open ("/dev/dsp", O_WRONLY | O_NDELAY, 0)) < 0) if (errno == EBUSY) { @@ -237,7 +237,7 @@ exit (1); } else -@@ -537,6 +537,7 @@ +@@ -537,6 +537,7 @@ int LinuxObuffer::open_audio_device (voi } // turn NDELAY mode off: @@ -245,7 +245,7 @@ int flags; if ((flags = fcntl (fd, F_GETFL, 0)) < 0) { -@@ -549,6 +550,7 @@ +@@ -549,6 +550,7 @@ int LinuxObuffer::open_audio_device (voi perror ("fcntl F_SETFL on /dev/audio failed"); exit (1); } @@ -253,7 +253,7 @@ return fd; } -@@ -558,7 +560,7 @@ +@@ -558,7 +560,7 @@ LinuxObuffer::LinuxObuffer (uint32 numbe #ifdef DEBUG if (!number_of_channels || number_of_channels > MAXCHANNELS) { @@ -262,7 +262,7 @@ exit (1); } #endif -@@ -568,7 +570,7 @@ +@@ -568,7 +570,7 @@ LinuxObuffer::LinuxObuffer (uint32 numbe if (audio_fd < 0) { @@ -271,7 +271,7 @@ "by LinuxObuffer::class_suitable()!\n"; exit (1); } -@@ -602,12 +604,12 @@ +@@ -602,12 +604,12 @@ void LinuxObuffer::append (uint32 channe #ifdef DEBUG if (channel >= channels) { @@ -286,7 +286,7 @@ exit (1); } #endif -@@ -629,7 +631,7 @@ +@@ -629,7 +631,7 @@ void LinuxObuffer::write_buffer (int) } diff --git a/audio/maplay/files/patch-obuffer.h b/audio/maplay/files/patch-obuffer.h index 01a70fbd3c55..7362f7a22b40 100644 --- a/audio/maplay/files/patch-obuffer.h +++ b/audio/maplay/files/patch-obuffer.h @@ -1,5 +1,5 @@ ---- obuffer.h.orig Thu Jun 23 22:14:40 1994 -+++ obuffer.h Thu Nov 21 16:35:11 2002 +--- obuffer.h.orig 1994-06-23 12:14:40 UTC ++++ obuffer.h @@ -27,7 +27,7 @@ #ifndef OBUFFER_H #define OBUFFER_H @@ -9,7 +9,7 @@ #include <unistd.h> #include <stdlib.h> #include "all.h" -@@ -123,20 +123,20 @@ +@@ -123,20 +123,20 @@ private: public: #ifdef ULAW @@ -34,7 +34,7 @@ // returnvalue == False: no 16-bit output possible (class unsuitable) #endif }; -@@ -159,7 +159,7 @@ +@@ -159,7 +159,7 @@ public: void append (uint32 channel, int16 value); void write_buffer (int dummy); diff --git a/audio/maplay/files/patch-subband.h b/audio/maplay/files/patch-subband.h index cca6875c8c00..a54ee49a9ba4 100644 --- a/audio/maplay/files/patch-subband.h +++ b/audio/maplay/files/patch-subband.h @@ -1,21 +1,13 @@ -*** subband.h.orig Thu Jun 23 21:14:40 1994 ---- subband.h Thu Dec 9 05:45:45 1999 -*************** -*** 35,42 **** - public: - virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; - virtual void read_scalefactor (Ibitstream *, Header *) = 0; -! virtual bool read_sampledata (Ibitstream *) = 0; -! virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; - }; - - #endif ---- 35,42 ---- - public: - virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; - virtual void read_scalefactor (Ibitstream *, Header *) = 0; -! virtual boolean read_sampledata (Ibitstream *) = 0; -! virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; - }; - - #endif +--- subband.h.orig 1994-06-23 12:14:40 UTC ++++ subband.h +@@ -35,8 +35,8 @@ class Subband + public: + virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; + virtual void read_scalefactor (Ibitstream *, Header *) = 0; +- virtual bool read_sampledata (Ibitstream *) = 0; +- virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; ++ virtual boolean read_sampledata (Ibitstream *) = 0; ++ virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; + }; + + #endif diff --git a/audio/maplay/files/patch-subband_layer_1.cc b/audio/maplay/files/patch-subband__layer__1.cc index aab7048c5e04..330b8fb14a98 100644 --- a/audio/maplay/files/patch-subband_layer_1.cc +++ b/audio/maplay/files/patch-subband__layer__1.cc @@ -1,6 +1,6 @@ ---- subband_layer_1.cc.orig Thu Jun 23 22:14:36 1994 -+++ subband_layer_1.cc Thu Nov 21 16:43:38 2002 -@@ -67,7 +67,7 @@ +--- subband_layer_1.cc.orig 1994-06-23 12:14:36 UTC ++++ subband_layer_1.cc +@@ -67,7 +67,7 @@ SubbandLayer1::SubbandLayer1 (uint32 sub void SubbandLayer1::read_allocation (Ibitstream *stream, Header *, Crc16 *crc) { if ((allocation = stream->get_bits (4)) == 15) @@ -9,7 +9,7 @@ if (crc) crc->add_bits (allocation, 4); if (allocation) -@@ -86,14 +86,14 @@ +@@ -86,14 +86,14 @@ void SubbandLayer1::read_scalefactor (Ib } @@ -26,7 +26,7 @@ #endif } if (++samplenumber == 12) -@@ -105,7 +105,7 @@ +@@ -105,7 +105,7 @@ bool SubbandLayer1::read_sampledata (Ibi } @@ -35,7 +35,7 @@ SynthesisFilter *filter1, SynthesisFilter *) { if (allocation && channels != right) -@@ -113,7 +113,7 @@ +@@ -113,7 +113,7 @@ bool SubbandLayer1::put_next_sample (e_c register real scaled_sample = (sample * factor + offset) * scalefactor; #ifdef DEBUG if (scaled_sample < -1.0 || scaled_sample > 1.0) @@ -44,7 +44,7 @@ // this should never occur #endif filter1->input_sample (scaled_sample, subbandnumber); -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ void SubbandLayer1IntensityStereo::read_ } @@ -53,7 +53,7 @@ SynthesisFilter *filter1, SynthesisFilter *filter2) { if (allocation) -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ bool SubbandLayer1IntensityStereo::put_n sample2 = sample * channel2_scalefactor; #ifdef DEBUG if (sample1 < -1.0 || sample1 > 1.0 || sample2 < -1.0 || sample2 > 1.0) @@ -62,7 +62,7 @@ // this should never occur #endif filter1->input_sample (sample1, subbandnumber); -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ bool SubbandLayer1IntensityStereo::put_n register real sample1 = sample * scalefactor; #ifdef DEBUG if (sample1 < -1.0 || sample1 > 1.0) @@ -71,7 +71,7 @@ // this should never occur #endif filter1->input_sample (sample1, subbandnumber); -@@ -175,7 +175,7 @@ +@@ -175,7 +175,7 @@ bool SubbandLayer1IntensityStereo::put_n register real sample2 = sample * channel2_scalefactor; #ifdef DEBUG if (sample2 < -1.0 || sample2 > 1.0) @@ -80,7 +80,7 @@ // this should never occur #endif filter1->input_sample (sample2, subbandnumber); -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ void SubbandLayer1Stereo::read_allocatio crc->add_bits (channel2_allocation, 4); } if (allocation == 15 || channel2_allocation == 15) @@ -89,7 +89,7 @@ if (allocation) { samplelength = allocation + 1; -@@ -231,22 +231,22 @@ +@@ -231,22 +231,22 @@ void SubbandLayer1Stereo::read_scalefact } @@ -116,7 +116,7 @@ SynthesisFilter *filter1, SynthesisFilter *filter2) { SubbandLayer1::put_next_sample (channels, filter1, filter2); -@@ -256,7 +256,7 @@ +@@ -256,7 +256,7 @@ bool SubbandLayer1Stereo::put_next_sampl channel2_scalefactor; #ifdef DEBUG if (sample2 < -1.0 || sample2 > 1.0) diff --git a/audio/maplay/files/patch-subband__layer__1.h b/audio/maplay/files/patch-subband__layer__1.h new file mode 100644 index 000000000000..81f58632fabf --- /dev/null +++ b/audio/maplay/files/patch-subband__layer__1.h @@ -0,0 +1,38 @@ +--- subband_layer_1.h.orig 1994-06-23 12:14:40 UTC ++++ subband_layer_1.h +@@ -42,8 +42,8 @@ public: + SubbandLayer1 (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +@@ -60,11 +60,11 @@ public: + SubbandLayer1::read_allocation (stream, header, crc); + } + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *stream) ++ boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer1::read_sampledata (stream); + } +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +@@ -82,8 +82,8 @@ public: + SubbandLayer1Stereo (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif diff --git a/audio/maplay/files/patch-subband__layer__2.cc b/audio/maplay/files/patch-subband__layer__2.cc new file mode 100644 index 000000000000..e0ad1297cde8 --- /dev/null +++ b/audio/maplay/files/patch-subband__layer__2.cc @@ -0,0 +1,54 @@ +--- subband_layer_2.cc.orig 1994-06-23 12:14:36 UTC ++++ subband_layer_2.cc +@@ -591,7 +591,7 @@ void SubbandLayer2::read_scalefactor (Ib + } + + +-bool SubbandLayer2::read_sampledata (Ibitstream *stream) ++boolean SubbandLayer2::read_sampledata (Ibitstream *stream) + { + if (allocation) + if (groupingtable) +@@ -633,7 +633,7 @@ bool SubbandLayer2::read_sampledata (Ibi + } + + +-bool SubbandLayer2::put_next_sample (e_channels channels, ++boolean SubbandLayer2::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *) + { + #ifdef DEBUG +@@ -726,7 +726,7 @@ void SubbandLayer2IntensityStereo::read_ + } + + +-bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, ++boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { + #ifdef DEBUG +@@ -880,9 +880,9 @@ void SubbandLayer2Stereo::read_scalefact + } + + +-bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) ++boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) + { +- bool returnvalue = SubbandLayer2::read_sampledata (stream); ++ boolean returnvalue = SubbandLayer2::read_sampledata (stream); + + if (channel2_allocation) + if (channel2_groupingtable) +@@ -919,10 +919,10 @@ bool SubbandLayer2Stereo::read_sampledat + } + + +-bool SubbandLayer2Stereo::put_next_sample (e_channels channels, ++boolean SubbandLayer2Stereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { +- bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); ++ boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); + if (channel2_allocation && channels != left) + { + register real sample = channel2_samples[samplenumber - 1]; diff --git a/audio/maplay/files/patch-subband__layer__2.h b/audio/maplay/files/patch-subband__layer__2.h new file mode 100644 index 000000000000..b1ee79319de7 --- /dev/null +++ b/audio/maplay/files/patch-subband__layer__2.h @@ -0,0 +1,47 @@ +--- subband_layer_2.h.orig 1994-06-23 12:14:40 UTC ++++ subband_layer_2.h +@@ -55,8 +55,8 @@ public: + void read_allocation (Ibitstream *, Header *, Crc16 *); + virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); + }; + + +@@ -75,11 +75,11 @@ public: + } + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *stream) ++ boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer2::read_sampledata (stream); + } +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +@@ -90,7 +90,7 @@ protected: + uint32 channel2_allocation; + uint32 channel2_scfsi; + real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; +- bool channel2_grouping; ++ boolean channel2_grouping; + uint32 channel2_codelength; + const real *channel2_groupingtable; + real channel2_factor; +@@ -102,8 +102,8 @@ public: + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif diff --git a/audio/maplay/files/patch-subband_layer_1.h b/audio/maplay/files/patch-subband_layer_1.h deleted file mode 100644 index d92c2f421598..000000000000 --- a/audio/maplay/files/patch-subband_layer_1.h +++ /dev/null @@ -1,65 +0,0 @@ -*** subband_layer_1.h.orig Thu Jun 23 21:14:40 1994 ---- subband_layer_1.h Thu Dec 9 05:32:19 1999 -*************** -*** 42,49 **** - SubbandLayer1 (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - ---- 42,49 ---- - SubbandLayer1 (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - -*************** -*** 60,70 **** - SubbandLayer1::read_allocation (stream, header, crc); - } - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *stream) - { - return SubbandLayer1::read_sampledata (stream); - } -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - ---- 60,70 ---- - SubbandLayer1::read_allocation (stream, header, crc); - } - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *stream) - { - return SubbandLayer1::read_sampledata (stream); - } -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - -*************** -*** 82,89 **** - SubbandLayer1Stereo (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif ---- 82,89 ---- - SubbandLayer1Stereo (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif diff --git a/audio/maplay/files/patch-subband_layer_2.cc b/audio/maplay/files/patch-subband_layer_2.cc deleted file mode 100644 index b30d8ad479a6..000000000000 --- a/audio/maplay/files/patch-subband_layer_2.cc +++ /dev/null @@ -1,97 +0,0 @@ -*** subband_layer_2.cc.orig Thu Jun 23 21:14:36 1994 ---- subband_layer_2.cc Thu Dec 9 05:32:19 1999 -*************** -*** 591,597 **** - } - - -! bool SubbandLayer2::read_sampledata (Ibitstream *stream) - { - if (allocation) - if (groupingtable) ---- 591,597 ---- - } - - -! boolean SubbandLayer2::read_sampledata (Ibitstream *stream) - { - if (allocation) - if (groupingtable) -*************** -*** 633,639 **** - } - - -! bool SubbandLayer2::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *) - { - #ifdef DEBUG ---- 633,639 ---- - } - - -! boolean SubbandLayer2::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *) - { - #ifdef DEBUG -*************** -*** 726,732 **** - } - - -! bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { - #ifdef DEBUG ---- 726,732 ---- - } - - -! boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { - #ifdef DEBUG -*************** -*** 880,888 **** - } - - -! bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) - { -! bool returnvalue = SubbandLayer2::read_sampledata (stream); - - if (channel2_allocation) - if (channel2_groupingtable) ---- 880,888 ---- - } - - -! boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) - { -! boolean returnvalue = SubbandLayer2::read_sampledata (stream); - - if (channel2_allocation) - if (channel2_groupingtable) -*************** -*** 919,928 **** - } - - -! bool SubbandLayer2Stereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { -! bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); - if (channel2_allocation && channels != left) - { - register real sample = channel2_samples[samplenumber - 1]; ---- 919,928 ---- - } - - -! boolean SubbandLayer2Stereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { -! boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); - if (channel2_allocation && channels != left) - { - register real sample = channel2_samples[samplenumber - 1]; diff --git a/audio/maplay/files/patch-subband_layer_2.h b/audio/maplay/files/patch-subband_layer_2.h deleted file mode 100644 index 313ab9b2c1fb..000000000000 --- a/audio/maplay/files/patch-subband_layer_2.h +++ /dev/null @@ -1,82 +0,0 @@ -*** subband_layer_2.h.orig Thu Jun 23 21:14:40 1994 ---- subband_layer_2.h Thu Dec 9 05:32:19 1999 -*************** -*** 55,62 **** - void read_allocation (Ibitstream *, Header *, Crc16 *); - virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); - }; - - ---- 55,62 ---- - void read_allocation (Ibitstream *, Header *, Crc16 *); - virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); - }; - - -*************** -*** 75,85 **** - } - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *stream) - { - return SubbandLayer2::read_sampledata (stream); - } -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - ---- 75,85 ---- - } - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *stream) - { - return SubbandLayer2::read_sampledata (stream); - } -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - -*************** -*** 90,96 **** - uint32 channel2_allocation; - uint32 channel2_scfsi; - real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; -! bool channel2_grouping; - uint32 channel2_codelength; - const real *channel2_groupingtable; - real channel2_factor; ---- 90,96 ---- - uint32 channel2_allocation; - uint32 channel2_scfsi; - real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; -! boolean channel2_grouping; - uint32 channel2_codelength; - const real *channel2_groupingtable; - real channel2_factor; -*************** -*** 102,109 **** - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif ---- 102,109 ---- - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif diff --git a/audio/maplay/files/patch-synthesis_filter.h b/audio/maplay/files/patch-synthesis__filter.h index c1b8c8599468..652fe31d9165 100644 --- a/audio/maplay/files/patch-synthesis_filter.h +++ b/audio/maplay/files/patch-synthesis__filter.h @@ -1,5 +1,5 @@ ---- synthesis_filter.h.orig Thu Nov 21 16:36:03 2002 -+++ synthesis_filter.h Thu Nov 21 16:36:10 2002 +--- synthesis_filter.h.orig 1994-06-23 12:14:40 UTC ++++ synthesis_filter.h @@ -21,7 +21,7 @@ #ifndef SYNTHESIS_FILTER_H #define SYNTHESIS_FILTER_H |