diff options
Diffstat (limited to 'audio/maplay')
| -rw-r--r-- | audio/maplay/Makefile | 35 | ||||
| -rw-r--r-- | audio/maplay/distinfo | 2 | ||||
| -rw-r--r-- | audio/maplay/files/patch-Makefile | 27 | ||||
| -rw-r--r-- | audio/maplay/files/patch-all.h | 11 | ||||
| -rw-r--r-- | audio/maplay/files/patch-configuration.sh | 25 | ||||
| -rw-r--r-- | audio/maplay/files/patch-crc.cc | 20 | ||||
| -rw-r--r-- | audio/maplay/files/patch-header.cc | 101 | ||||
| -rw-r--r-- | audio/maplay/files/patch-header.h | 36 | ||||
| -rw-r--r-- | audio/maplay/files/patch-ibitstream.cc | 81 | ||||
| -rw-r--r-- | audio/maplay/files/patch-ibitstream.h | 15 | ||||
| -rw-r--r-- | audio/maplay/files/patch-maplay.cc | 220 | ||||
| -rw-r--r-- | audio/maplay/files/patch-obuffer.cc | 297 | ||||
| -rw-r--r-- | audio/maplay/files/patch-obuffer.h | 45 | ||||
| -rw-r--r-- | audio/maplay/files/patch-subband.h | 13 | ||||
| -rw-r--r-- | audio/maplay/files/patch-subband__layer__1.cc | 127 | ||||
| -rw-r--r-- | audio/maplay/files/patch-subband__layer__1.h | 38 | ||||
| -rw-r--r-- | audio/maplay/files/patch-subband__layer__2.cc | 54 | ||||
| -rw-r--r-- | audio/maplay/files/patch-subband__layer__2.h | 47 | ||||
| -rw-r--r-- | audio/maplay/files/patch-synthesis__filter.h | 11 | ||||
| -rw-r--r-- | audio/maplay/pkg-descr | 18 |
20 files changed, 0 insertions, 1223 deletions
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile deleted file mode 100644 index cdbcb60963f1..000000000000 --- a/audio/maplay/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: jkh -# $FreeBSD$ - -PORTNAME= maplay -PORTVERSION= 1.2 -CATEGORIES= audio -MASTER_SITES= ftp://ftp.tnt.uni-hannover.de/pub/MPEG/audio/other-servers/Maplay-Mirror/ -DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/} - -MAINTAINER= ports@FreeBSD.org -COMMENT= MPEG audio player/decoder decoding layer I and II MPEG audio streams - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= unfetchable -DEPRECATED= Unfetchable, unmaintained -EXPIRATION_DATE= 2019-10-16 - -NO_WRKSUBDIR= yes -USES= tar:Z - -PLIST_FILES= bin/maplay -PORTDOCS= README - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/maplay ${STAGEDIR}${PREFIX}/bin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/audio/maplay/distinfo b/audio/maplay/distinfo deleted file mode 100644 index 66f5f14978d8..000000000000 --- a/audio/maplay/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (maplay1_2.tar.Z) = a01a8628f7cfef26d1b850d7700a6ca503f74fdeb9ed129b881c77634a10c959 -SIZE (maplay1_2.tar.Z) = 95719 diff --git a/audio/maplay/files/patch-Makefile b/audio/maplay/files/patch-Makefile deleted file mode 100644 index 7c121ece4f73..000000000000 --- a/audio/maplay/files/patch-Makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 deleted file mode 100644 index 65eb467c28e3..000000000000 --- a/audio/maplay/files/patch-all.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 413230ebe0b9..000000000000 --- a/audio/maplay/files/patch-configuration.sh +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 deleted file mode 100644 index a696e814000e..000000000000 --- a/audio/maplay/files/patch-crc.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- 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. - */ - --#include <iostream.h> -+#include <iostream> - #include <stdlib.h> - #include "crc.h" - -@@ -32,7 +32,7 @@ void Crc16::add_bits (uint32 bitstring, - #ifdef DEBUG - if (!length) - { -- cerr << "Length of bitstring has to be > 0 in Crc16::add_bits()!\n"; -+ std::cerr << "Length of bitstring has to be > 0 in Crc16::add_bits()!\n"; - exit (1); - } - #endif diff --git a/audio/maplay/files/patch-header.cc b/audio/maplay/files/patch-header.cc deleted file mode 100644 index 2aa843b5a4fe..000000000000 --- a/audio/maplay/files/patch-header.cc +++ /dev/null @@ -1,101 +0,0 @@ ---- header.cc.orig 1994-06-23 12:14:35 UTC -+++ header.cc -@@ -20,15 +20,15 @@ - - /* - * Changes from version 1.1 to 1.2: -- * - iostreams manipulator calls like "cerr << setw (2) << ..." replaced by -- * "cerr.width (2); ..." due to problems with older GNU C++ releases. -+ * - iostreams manipulator calls like "std::cerr << setw (2) << ..." replaced by -+ * "std::cerr.width (2); ..." due to problems with older GNU C++ releases. - * - syncword recognition slightly changed - */ - - #include <sys/types.h> - #include <unistd.h> --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+#include <iomanip> - #include <stdlib.h> - #include "header.h" - -@@ -36,7 +36,7 @@ - const uint32 Header::frequencies[3] = { 44100, 48000, 32000 }; - - --bool Header::read_header (Ibitstream *stream, Crc16 **crcp) -+boolean Header::read_header (Ibitstream *stream, Crc16 **crcp) - { - uint32 headerstring; - -@@ -45,41 +45,41 @@ bool Header::read_header (Ibitstream *st - - if ((headerstring & 0xFFF80000) != 0xFFF80000) - { -- cerr << "invalid syncword 0x"; -- cerr.width (8); -- cerr.fill ('0'); -- cerr << hex << headerstring -- << " found at fileoffset " << dec -+ std::cerr << "invalid syncword 0x"; -+ std::cerr.width (8); -+ std::cerr.fill ('0'); -+ std::cerr << std::hex << headerstring -+ << " found at fileoffset " << std::dec - << lseek (stream->filedescriptor (), 0, SEEK_CUR) - 4 << '\n'; - return False; - } - - if ((h_layer = (headerstring >> 17) & 3) == 0) - { -- cerr << "unknown layer identifier found!\n"; -+ std::cerr << "unknown layer identifier found!\n"; - exit (1); - } - h_layer = 4 - h_layer; // now 1 means Layer I and 3 means Layer III - if (h_layer == 3) - { -- cerr << "Sorry, Layer III not implemented!\n"; -+ std::cerr << "Sorry, Layer III not implemented!\n"; - exit (1); - } - h_protection_bit = (headerstring >> 16) & 1; - if ((h_bitrate_index = (headerstring >> 12) & 0xF) == 15) - { -- cerr << "unknown bitrate index found!\n"; -+ std::cerr << "unknown bitrate index found!\n"; - exit (1); - } - if (!h_bitrate_index) - { -- cerr << "free format not yet implemented!\n"; -+ std::cerr << "free format not yet implemented!\n"; - exit (1); - } - - if ((h_sample_frequency = (e_sample_frequency)((headerstring >> 10) & 3)) == 3) - { -- cerr << "unknown sample frequency!\n"; -+ std::cerr << "unknown sample frequency!\n"; - exit (1); - } - h_padding_bit = (headerstring >> 9) & 1; -@@ -90,7 +90,7 @@ bool Header::read_header (Ibitstream *st - h_mode != single_channel) || - (h_bitrate_index >= 11 && h_mode == single_channel)) - { -- cerr << "illegal combination of mode and bitrate in a layer II stream:\n" -+ std::cerr << "illegal combination of mode and bitrate in a layer II stream:\n" - " mode: " << mode_string () - << "\n bitrate: " << bitrate_string () << '\n'; - exit (1); -@@ -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 }; -- static const samplefrequencies[3] = { 44100, 48000, 32000 }; -+ static const int32 samplefrequencies[3] = { 44100, 48000, 32000 }; - uint32 framesize; - - if (h_layer == 1) diff --git a/audio/maplay/files/patch-header.h b/audio/maplay/files/patch-header.h deleted file mode 100644 index be0a83a8c978..000000000000 --- a/audio/maplay/files/patch-header.h +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 deleted file mode 100644 index b025c7d07328..000000000000 --- a/audio/maplay/files/patch-ibitstream.cc +++ /dev/null @@ -1,81 +0,0 @@ ---- ibitstream.cc.orig 1994-06-23 12:14:35 UTC -+++ ibitstream.cc -@@ -29,7 +29,7 @@ - #include <unistd.h> - #include <errno.h> - #include <fcntl.h> --#include <iostream.h> -+#include <iostream> - #include "all.h" - #include "ibitstream.h" - -@@ -50,7 +50,7 @@ Ibitstream::Ibitstream (const char *file - { - if ((fd = open (filename, O_RDONLY, 0)) < 0) - { -- cerr << "can't open file \"" << filename << "\" for reading!\n"; -+ std::cerr << "can't open file \"" << filename << "\" for reading!\n"; - exit (1); - } - wordpointer = buffer; -@@ -64,7 +64,7 @@ Ibitstream::~Ibitstream (void) // des - } - - --bool Ibitstream::get_header (uint32 *headerstring) -+boolean Ibitstream::get_header (uint32 *headerstring) - { - int readvalue; - -@@ -102,13 +102,13 @@ bool Ibitstream::get_header (uint32 *hea - } - - --bool Ibitstream::read_frame (uint32 bytesize) -+boolean Ibitstream::read_frame (uint32 bytesize) - { - int readvalue; - - if (bytesize > (bufferintsize << 2)) - { -- cerr << "Internal error: framelength > bufferlength?!\n"; -+ std::cerr << "Internal error: framelength > bufferlength?!\n"; - exit (1); - } - -@@ -170,7 +170,7 @@ uint32 Ibitstream::get_bits (uint32 numb - #ifdef DEBUG - if (number_of_bits < 1 || number_of_bits > 16) - { -- cerr << "illegal parameter in Ibitstream::get_bits() !\n"; -+ std::cerr << "illegal parameter in Ibitstream::get_bits() !\n"; - exit (1); - } - #endif -@@ -184,7 +184,7 @@ uint32 Ibitstream::get_bits (uint32 numb - bitindex = 0; - if ((char *)++wordpointer > (char *)buffer + framesize) - { -- cerr << "Ibitstream::get_bits(): no more bits in buffer!\n"; -+ std::cerr << "Ibitstream::get_bits(): no more bits in buffer!\n"; - exit (1); - } - } -@@ -197,7 +197,7 @@ uint32 Ibitstream::get_bits (uint32 numb - *(int16 *)&returnvalue = *((int16 *)wordpointer + 1); - if ((char *)++wordpointer > (char *)buffer + framesize) - { -- cerr << "Ibitstream::get_bits(): no more bits in buffer!\n"; -+ std::cerr << "Ibitstream::get_bits(): no more bits in buffer!\n"; - exit (1); - } - *((int16 *)&returnvalue + 1) = *(int16 *)wordpointer; -@@ -205,7 +205,7 @@ uint32 Ibitstream::get_bits (uint32 numb - *((int16 *)&returnvalue + 1) = *(int16 *)wordpointer; - if ((char *)++wordpointer > (char *)buffer + framesize) - { -- cerr << "Ibitstream::get_bits(): no more bits in buffer!\n"; -+ std::cerr << "Ibitstream::get_bits(): no more bits in buffer!\n"; - exit (1); - } - *(int16 *)&returnvalue = *((int16 *)wordpointer + 1); diff --git a/audio/maplay/files/patch-ibitstream.h b/audio/maplay/files/patch-ibitstream.h deleted file mode 100644 index 8da2fbf03bb9..000000000000 --- a/audio/maplay/files/patch-ibitstream.h +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index e42a69af4179..000000000000 --- a/audio/maplay/files/patch-maplay.cc +++ /dev/null @@ -1,220 +0,0 @@ ---- maplay.cc.orig 1994-06-23 12:14:36 UTC -+++ maplay.cc -@@ -39,8 +39,8 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+#include <iomanip> - #include "all.h" - #include "crc.h" - #include "header.h" -@@ -51,17 +51,16 @@ - #include "subband_layer_2.h" - #include "synthesis_filter.h" - -- - // data extracted from commandline arguments: - static char *filename; --static bool verbose_mode = False, filter_check = False; --static bool stdout_mode = False; -+static boolean verbose_mode = False, filter_check = False; -+static boolean stdout_mode = False; - static enum e_channels which_channels = both; --static bool use_speaker = False, use_headphone = False, use_line_out = False; -+static boolean use_speaker = False, use_headphone = False, use_line_out = False; - #ifdef ULAW --static bool force_amd = False; -+static boolean force_amd = False; - #endif --static bool use_own_scalefactor = False; -+static boolean use_own_scalefactor = False; - static real scalefactor; - - // data extracted from header of first frame: -@@ -90,15 +89,15 @@ static void Exit (int returncode) - } - - --main (int argc, char *argv[]) -+int main (int argc, char *argv[]) - { - int i; -- bool read_ready = False, write_ready = False; -+ boolean read_ready = False, write_ready = False; - - if (argc < 2 || !strncmp (argv[1], "-h", 2)) - { - usage: -- cerr << "\nusage: " << argv[0] -+ std::cerr << "\nusage: " << argv[0] - << " [-v] [-s] [-l] [-r] " - #ifdef SPARC - "[-us] [-uh] " -@@ -146,6 +145,9 @@ usage: - #ifdef Solaris - "SPARC Solaris 2.x" - #else -+#ifdef __FreeBSD__ -+ "FreeBSD" -+#else - #ifdef LINUX - "Linux" - #else -@@ -159,6 +161,7 @@ usage: - #endif - #endif - #endif -+#endif - " version)\n" - "@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de)\n" - "@(#) Berlin University of Technology\n" -@@ -216,7 +219,7 @@ usage: - case 'f': - if (++i == argc) - { -- cerr << "please specify a new scalefactor after the -f option!\n"; -+ std::cerr << "please specify a new scalefactor after the -f option!\n"; - exit (1); - } - use_own_scalefactor = True; -@@ -243,7 +246,7 @@ usage: - header = new Header; - if (!header->read_header (stream, &crc)) - { -- cerr << "no header found!\n"; -+ std::cerr << "no header found!\n"; - Exit (1); - } - -@@ -328,7 +331,7 @@ usage: - // } - //#else - { -- cerr << "Sorry, I don't know your audio device.\n" -+ std::cerr << "Sorry, I don't know your audio device.\n" - "Please use the stdout mode.\n"; - Exit (0); - } -@@ -345,22 +348,22 @@ usage: - ++name; - else - name = filename; -- cerr << name << " is a layer " << header->layer_string () << ' ' -+ std::cerr << name << " is a layer " << header->layer_string () << ' ' - << header->mode_string () << " MPEG audio stream with"; - if (!header->checksums ()) -- cerr << "out"; -- cerr << " checksums.\nThe sample frequency is " -+ std::cerr << "out"; -+ std::cerr << " checksums.\nThe sample frequency is " - << header->sample_frequency_string () << " at a bitrate of " - << header->bitrate_string () << ".\n" - "This stream is "; - if (header->original ()) -- cerr << "an original"; -+ std::cerr << "an original"; - else -- cerr << "a copy"; -- cerr << " and is "; -+ std::cerr << "a copy"; -+ std::cerr << " and is "; - if (!header->copyright ()) -- cerr << "not "; -- cerr << "copyright protected.\n"; -+ std::cerr << "not "; -+ std::cerr << "copyright protected.\n"; - } - - do -@@ -371,20 +374,20 @@ usage: - { - // layer switching is allowed - if (verbose_mode) -- cerr << "switching to layer " << header->layer_string () << ".\n"; -+ std::cerr << "switching to layer " << header->layer_string () << ".\n"; - layer = header->layer (); - } - if ((mode == single_channel && header->mode () != single_channel) || - (mode != single_channel && header->mode () == single_channel)) - { - // switching from single channel to stereo or vice versa is not allowed -- cerr << "illegal switch from single channel to stereo or vice versa!\n"; -+ std::cerr << "illegal switch from single channel to stereo or vice versa!\n"; - Exit (1); - } - if (header->sample_frequency () != sample_frequency) - { - // switching the sample frequency is not allowed -- cerr << "sorry, can't switch the sample frequency in the middle of the stream!\n"; -+ std::cerr << "sorry, can't switch the sample frequency in the middle of the stream!\n"; - Exit (1); - } - -@@ -423,7 +426,7 @@ usage: - } - else - { -- cerr << "sorry, layer 3 not implemented!\n"; -+ std::cerr << "sorry, layer 3 not implemented!\n"; - Exit (0); - } - -@@ -463,7 +466,7 @@ usage: - } - else - // Sh*t! Wrong crc checksum in frame! -- cerr << "WARNING: frame contains wrong crc checksum! (throwing frame away)\n"; -+ std::cerr << "WARNING: frame contains wrong crc checksum! (throwing frame away)\n"; - - for (i = 0; i < header->number_of_subbands (); ++i) - delete subbands[i]; -@@ -481,18 +484,18 @@ usage: - // check whether (one of) the filter(s) produced values not in [-1.0, 1.0]: - if (range_violations) - { -- cerr << range_violations << " range violations have occured!\n"; -+ std::cerr << range_violations << " range violations have occurred!\n"; - if (stdout_mode) -- cerr << "If you notice these violations,\n"; -+ std::cerr << "If you notice these violations,\n"; - else -- cerr << "If you have noticed these violations,\n"; -- cerr << "please use the -f option with the value "; -+ std::cerr << "If you have noticed these violations,\n"; -+ std::cerr << "please use the -f option with the value "; - if (mode != single_channel && which_channels == both && - filter2->hardest_violation () > filter1->hardest_violation ()) -- cerr << filter2->recommended_scalefactor (); -+ std::cerr << filter2->recommended_scalefactor (); - else -- cerr << filter1->recommended_scalefactor (); -- cerr << "\nor a greater value up to 32768 and try again.\n"; -+ std::cerr << filter1->recommended_scalefactor (); -+ std::cerr << "\nor a greater value up to 32768 and try again.\n"; - } - } - if (verbose_mode) -@@ -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); -- cerr << "end of stream, playtime: " << minutes << ':'; -- cerr.width (2); -- cerr.fill ('0'); -- cerr << seconds << '.'; -- cerr.width (2); -- cerr.fill ('0'); -- cerr << centiseconds << '\n'; -+ std::cerr << "end of stream, playtime: " << minutes << ':'; -+ std::cerr.width (2); -+ std::cerr.fill ('0'); -+ std::cerr << seconds << '.'; -+ std::cerr.width (2); -+ std::cerr.fill ('0'); -+ std::cerr << centiseconds << '\n'; - } - - return 0; diff --git a/audio/maplay/files/patch-obuffer.cc b/audio/maplay/files/patch-obuffer.cc deleted file mode 100644 index e1beded33c34..000000000000 --- a/audio/maplay/files/patch-obuffer.cc +++ /dev/null @@ -1,297 +0,0 @@ ---- obuffer.cc.orig 1994-06-27 11:14:03 UTC -+++ obuffer.cc -@@ -47,7 +47,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> --#include <iostream.h> -+#include <iostream> - #include "obuffer.h" - #include "header.h" - #ifdef ULAW -@@ -65,14 +65,14 @@ FileObuffer::FileObuffer (uint32 number_ - #ifdef DEBUG - if (!number_of_channels || number_of_channels > MAXCHANNELS) - { -- cerr << "FileObuffer: number of channels has to be in [1, " << MAXCHANNELS << "] !\n"; -+ std::cerr << "FileObuffer: number of channels has to be in [1, " << MAXCHANNELS << "] !\n"; - exit (1); - } - #endif - - #ifdef ULAW - if (number_of_channels > 1) -- cerr << "Are you sure you need stereo u-law output?\n"; -+ std::cerr << "Are you sure you need stereo u-law output?\n"; - #endif - channels = number_of_channels; - for (int i = 0; i < number_of_channels; ++i) -@@ -85,12 +85,12 @@ void FileObuffer::append (uint32 channel - #ifdef DEBUG - if (channel >= channels) - { -- cerr << "illegal channelnumber in FileObuffer::append()!\n"; -+ std::cerr << "illegal channelnumber in FileObuffer::append()!\n"; - exit (1); - } - if (bufferp[channel] - buffer >= OBUFFERSIZE) - { -- cerr << "FileObuffer: buffer overflow!\n"; -+ std::cerr << "FileObuffer: buffer overflow!\n"; - exit (1); - } - #endif -@@ -143,7 +143,7 @@ IndigoObuffer::IndigoObuffer (uint32 num - #ifdef DEBUG - if (!number_of_channels || number_of_channels > MAXCHANNELS) - { -- cerr << "IndigoObuffer: number of channels has to be in [1, " << MAXCHANNELS << "] !\n"; -+ std::cerr << "IndigoObuffer: number of channels has to be in [1, " << MAXCHANNELS << "] !\n"; - exit (1); - } - #endif -@@ -155,7 +155,7 @@ IndigoObuffer::IndigoObuffer (uint32 num - ALconfig config; - if (!(config = ALnewconfig ())) - { -- cerr << "ALnewconfig failed!\n"; -+ std::cerr << "ALnewconfig failed!\n"; - exit (1); - } - ALsetwidth (config, AL_SAMPLE_16); -@@ -165,7 +165,7 @@ IndigoObuffer::IndigoObuffer (uint32 num - ALsetchannels (config, AL_STEREO); - if (!(port = ALopenport ("MPEG audio player", "w", config))) - { -- cerr << "can't allocate an audio port!\n"; -+ std::cerr << "can't allocate an audio port!\n"; - exit (1); - } - -@@ -190,12 +190,12 @@ void IndigoObuffer::append (uint32 chann - #ifdef DEBUG - if (channel >= channels) - { -- cerr << "illegal channelnumber in IndigoObuffer::append()!\n"; -+ std::cerr << "illegal channelnumber in IndigoObuffer::append()!\n"; - exit (1); - } - if (bufferp[channel] - buffer >= OBUFFERSIZE) - { -- cerr << "IndigoObuffer: buffer overflow!\n"; -+ std::cerr << "IndigoObuffer: buffer overflow!\n"; - exit (1); - } - #endif -@@ -217,17 +217,17 @@ void IndigoObuffer::write_buffer (int) - int SparcObuffer::audio_fd = -1; - - #ifdef ULAW --SparcObuffer::SparcObuffer (Header *header, bool use_speaker, bool use_headphone, bool use_line_out) -+SparcObuffer::SparcObuffer (Header *header, boolean use_speaker, boolean use_headphone, boolean use_line_out) - #else - SparcObuffer::SparcObuffer (uint32 number_of_channels, Header *header, -- bool use_speaker, bool use_headphone, bool use_line_out) -+ boolean use_speaker, boolean use_headphone, boolean use_line_out) - #endif - { - #ifndef ULAW - #ifdef DEBUG - if (!number_of_channels || number_of_channels > MAXCHANNELS) - { -- cerr << "SparcObuffer: 0 < number of channels < " << MAXCHANNELS << "!\n"; -+ std::cerr << "SparcObuffer: 0 < number of channels < " << MAXCHANNELS << "!\n"; - exit (1); - } - #endif -@@ -235,7 +235,7 @@ SparcObuffer::SparcObuffer (uint32 numbe - - if (audio_fd < 0) - { -- cerr << "Internal error: SparcObuffer::audio_fd has to be initialized\n" -+ std::cerr << "Internal error: SparcObuffer::audio_fd has to be initialized\n" - "by SparcObuffer::class_suitable()!\n"; - exit (1); - } -@@ -296,7 +296,7 @@ void SparcObuffer::append (uint32 channe - #ifdef DEBUG - if (bufferp - buffer >= OBUFFERSIZE >> 1) - { -- cerr << "SparcObuffer: buffer overflow!\n"; -+ std::cerr << "SparcObuffer: buffer overflow!\n"; - exit (1); - } - #endif -@@ -307,12 +307,12 @@ void SparcObuffer::append (uint32 channe - #ifdef DEBUG - if (channel >= channels) - { -- cerr << "illegal channelnumber in SparcObuffer::append()!\n"; -+ std::cerr << "illegal channelnumber in SparcObuffer::append()!\n"; - exit (1); - } - if (bufferp[channel] - buffer >= OBUFFERSIZE) - { -- cerr << "SparcObuffer: buffer overflow!\n"; -+ std::cerr << "SparcObuffer: buffer overflow!\n"; - exit (1); - } - #endif -@@ -351,7 +351,7 @@ int SparcObuffer::open_audio_device (voi - if ((fd = open ("/dev/audio", O_WRONLY | O_NDELAY, 0)) < 0) - if (errno == EBUSY) - { -- cerr << "Sorry, the audio device is busy!\n"; -+ std::cerr << "Sorry, the audio device is busy!\n"; - exit (1); - } - else -@@ -398,7 +398,7 @@ int SparcObuffer::get_device_type (int f - } - return devtype; - #else -- cerr << "SparcObuffer::get_device_type(): AUDIO_GETDEV ioctl not available!\n"; -+ std::cerr << "SparcObuffer::get_device_type(): AUDIO_GETDEV ioctl not available!\n"; - return -1; - #endif - } -@@ -406,15 +406,15 @@ int SparcObuffer::get_device_type (int f - - - #ifdef ULAW --bool SparcObuffer::class_suitable (uint32 number_of_channels, bool force_amd) -+boolean SparcObuffer::class_suitable (uint32 number_of_channels, boolean force_amd) - #else --bool SparcObuffer::class_suitable (void) -+boolean SparcObuffer::class_suitable (void) - #endif - { - #ifdef ULAW - if (number_of_channels > 1) - { -- cerr << "Your audio hardware cannot handle more than one audio channel.\n" -+ std::cerr << "Your audio hardware cannot handle more than one audio channel.\n" - "Please use the option -l or -r for stereo streams.\n"; - return False; - } -@@ -436,7 +436,7 @@ bool SparcObuffer::class_suitable (void) - return True; - else if (!strcmp (devtype.name, "SUNW,dbri")) - { -- cerr << "Your machine can produce CD-quality audio output,\n" -+ std::cerr << "Your machine can produce CD-quality audio output,\n" - "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 @@ bool SparcObuffer::class_suitable (void) - return True; - else if (!strcmp (devtype.name, "SUNW,am79c30")) - { -- cerr << "Your machine can produce 8 kHz u-law audio output only,\n" -+ std::cerr << "Your machine can produce 8 kHz u-law audio output only,\n" - "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 @@ bool SparcObuffer::class_suitable (void) - # ifdef ULAW - return True; - # else -- cerr << "Your machine can produce 8 kHz u-law audio output only,\n" -+ std::cerr << "Your machine can produce 8 kHz u-law audio output only,\n" - "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 @@ bool SparcObuffer::class_suitable (void) - return True; - else if (device_type == AUDIO_DEV_SPEAKERBOX) - { -- cerr << "Your machine can produce CD-quality audio output,\n" -+ std::cerr << "Your machine can produce CD-quality audio output,\n" - "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 @@ bool SparcObuffer::class_suitable (void) - return True; - else if (device_type == AUDIO_DEV_AMD) - { -- cerr << "Your machine can produce 8 kHz u-law audio output only,\n" -+ std::cerr << "Your machine can produce 8 kHz u-law audio output only,\n" - "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 @@ bool SparcObuffer::class_suitable (void) - - #ifndef SunOS4_1_1 - close (audio_fd); -- cerr << "Sorry, I don't recognize your audio device.\n" -+ std::cerr << "Sorry, I don't recognize your audio device.\n" - # ifdef ULAW - "Please try the -amd option or use the stdout mode.\n"; - # else -@@ -527,7 +527,7 @@ int LinuxObuffer::open_audio_device (voi - if ((fd = open ("/dev/dsp", O_WRONLY | O_NDELAY, 0)) < 0) - if (errno == EBUSY) - { -- cerr << "Sorry, the audio device is busy!\n"; -+ std::cerr << "Sorry, the audio device is busy!\n"; - exit (1); - } - else -@@ -537,6 +537,7 @@ int LinuxObuffer::open_audio_device (voi - } - - // turn NDELAY mode off: -+#ifndef __FreeBSD__ /* Our /dev/audio doesn't like non-blocking I/O */ - int flags; - if ((flags = fcntl (fd, F_GETFL, 0)) < 0) - { -@@ -549,6 +550,7 @@ int LinuxObuffer::open_audio_device (voi - perror ("fcntl F_SETFL on /dev/audio failed"); - exit (1); - } -+#endif - return fd; - } - -@@ -558,7 +560,7 @@ LinuxObuffer::LinuxObuffer (uint32 numbe - #ifdef DEBUG - if (!number_of_channels || number_of_channels > MAXCHANNELS) - { -- cerr << "LinuxObuffer: 0 < number of channels < " << MAXCHANNELS << "!\n"; -+ std::cerr << "LinuxObuffer: 0 < number of channels < " << MAXCHANNELS << "!\n"; - exit (1); - } - #endif -@@ -568,7 +570,7 @@ LinuxObuffer::LinuxObuffer (uint32 numbe - - if (audio_fd < 0) - { -- cerr << "Internal error, LinuxObuffer::audio_fd has to be initialized\n" -+ std::cerr << "Internal error, LinuxObuffer::audio_fd has to be initialized\n" - "by LinuxObuffer::class_suitable()!\n"; - exit (1); - } -@@ -602,12 +604,12 @@ void LinuxObuffer::append (uint32 channe - #ifdef DEBUG - if (channel >= channels) - { -- cerr << "illegal channelnumber in LinuxObuffer::append()!\n"; -+ std::cerr << "illegal channelnumber in LinuxObuffer::append()!\n"; - exit (1); - } - if (bufferp[channel] - buffer >= OBUFFERSIZE) - { -- cerr << "buffer overflow!\n"; -+ std::cerr << "buffer overflow!\n"; - exit (1); - } - #endif -@@ -629,7 +631,7 @@ void LinuxObuffer::write_buffer (int) - } - - --bool LinuxObuffer::class_suitable (uint32 number_of_channels) -+boolean LinuxObuffer::class_suitable (uint32 number_of_channels) - { - // open the dsp audio device: - audio_fd = open_audio_device (); diff --git a/audio/maplay/files/patch-obuffer.h b/audio/maplay/files/patch-obuffer.h deleted file mode 100644 index 7362f7a22b40..000000000000 --- a/audio/maplay/files/patch-obuffer.h +++ /dev/null @@ -1,45 +0,0 @@ ---- obuffer.h.orig 1994-06-23 12:14:40 UTC -+++ obuffer.h -@@ -27,7 +27,7 @@ - #ifndef OBUFFER_H - #define OBUFFER_H - --#include <iostream.h> -+#include <iostream> - #include <unistd.h> - #include <stdlib.h> - #include "all.h" -@@ -123,20 +123,20 @@ private: - - public: - #ifdef ULAW -- SparcObuffer (Header *, bool use_speaker, bool use_headphone, bool use_line_out); -+ SparcObuffer (Header *, boolean use_speaker, boolean use_headphone, boolean use_line_out); - #else - SparcObuffer (uint32 number_of_channels, Header *, -- bool use_speaker, bool use_headphone, bool use_line_out); -+ boolean use_speaker, boolean use_headphone, boolean use_line_out); - #endif - ~SparcObuffer (void); - void append (uint32 channel, int16 value); - void write_buffer (int dummy); - - #ifdef ULAW -- static bool class_suitable (uint32 number_of_channels, bool force_amd); -+ static boolean class_suitable (uint32 number_of_channels, boolean force_amd); - // returnvalue == False: no u-law output possible (class unsuitable) - #else -- static bool class_suitable (void); -+ static boolean class_suitable (void); - // returnvalue == False: no 16-bit output possible (class unsuitable) - #endif - }; -@@ -159,7 +159,7 @@ public: - void append (uint32 channel, int16 value); - void write_buffer (int dummy); - -- static bool class_suitable (uint32 number_of_channels); -+ static boolean class_suitable (uint32 number_of_channels); - }; - #endif // LINUX - diff --git a/audio/maplay/files/patch-subband.h b/audio/maplay/files/patch-subband.h deleted file mode 100644 index a54ee49a9ba4..000000000000 --- a/audio/maplay/files/patch-subband.h +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 deleted file mode 100644 index 330b8fb14a98..000000000000 --- a/audio/maplay/files/patch-subband__layer__1.cc +++ /dev/null @@ -1,127 +0,0 @@ ---- 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) -- cerr << "WARNING: stream contains an illegal allocation!\n"; // MPEG-stream is corrupted! -+ std::cerr << "WARNING: stream contains an illegal allocation!\n"; // MPEG-stream is corrupted! - if (crc) - crc->add_bits (allocation, 4); - if (allocation) -@@ -86,14 +86,14 @@ void SubbandLayer1::read_scalefactor (Ib - } - - --bool SubbandLayer1::read_sampledata (Ibitstream *stream) -+boolean SubbandLayer1::read_sampledata (Ibitstream *stream) - { - if (allocation) - { - sample = real (stream->get_bits (samplelength)); - #ifdef DEBUG - if (sample == (1 << samplelength) - 1) -- cerr << "WARNING: stream contains an illegal subband sample!\n"; // MPEG-stream is corrupted! -+ std::cerr << "WARNING: stream contains an illegal subband sample!\n"; // MPEG-stream is corrupted! - #endif - } - if (++samplenumber == 12) -@@ -105,7 +105,7 @@ bool SubbandLayer1::read_sampledata (Ibi - } - - --bool SubbandLayer1::put_next_sample (e_channels channels, -+boolean SubbandLayer1::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *) - { - if (allocation && channels != right) -@@ -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) -- cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; -+ std::cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; - // this should never occur - #endif - filter1->input_sample (scaled_sample, subbandnumber); -@@ -142,7 +142,7 @@ void SubbandLayer1IntensityStereo::read_ - } - - --bool SubbandLayer1IntensityStereo::put_next_sample (e_channels channels, -+boolean SubbandLayer1IntensityStereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { - if (allocation) -@@ -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) -- cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; -+ std::cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; - // this should never occur - #endif - filter1->input_sample (sample1, subbandnumber); -@@ -165,7 +165,7 @@ bool SubbandLayer1IntensityStereo::put_n - register real sample1 = sample * scalefactor; - #ifdef DEBUG - if (sample1 < -1.0 || sample1 > 1.0) -- cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; -+ std::cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; - // this should never occur - #endif - filter1->input_sample (sample1, subbandnumber); -@@ -175,7 +175,7 @@ bool SubbandLayer1IntensityStereo::put_n - register real sample2 = sample * channel2_scalefactor; - #ifdef DEBUG - if (sample2 < -1.0 || sample2 > 1.0) -- cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; -+ std::cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; - // this should never occur - #endif - filter1->input_sample (sample2, subbandnumber); -@@ -206,7 +206,7 @@ void SubbandLayer1Stereo::read_allocatio - crc->add_bits (channel2_allocation, 4); - } - if (allocation == 15 || channel2_allocation == 15) -- cerr << "WARNING: stream contains an illegal allocation!\n"; // MPEG-stream is corrupted! -+ std::cerr << "WARNING: stream contains an illegal allocation!\n"; // MPEG-stream is corrupted! - if (allocation) - { - samplelength = allocation + 1; -@@ -231,22 +231,22 @@ void SubbandLayer1Stereo::read_scalefact - } - - --bool SubbandLayer1Stereo::read_sampledata (Ibitstream *stream) -+boolean SubbandLayer1Stereo::read_sampledata (Ibitstream *stream) - { -- bool returnvalue = SubbandLayer1::read_sampledata (stream); -+ boolean returnvalue = SubbandLayer1::read_sampledata (stream); - if (channel2_allocation) - { - channel2_sample = real (stream->get_bits (channel2_samplelength)); - #ifdef DEBUG - if (channel2_sample == (1 << channel2_samplelength) - 1) -- cerr << "WARNING: stream contains an illegal subband sample!\n"; // MPEG-stream is corrupted! -+ std::cerr << "WARNING: stream contains an illegal subband sample!\n"; // MPEG-stream is corrupted! - #endif - } - return returnvalue; - } - - --bool SubbandLayer1Stereo::put_next_sample (e_channels channels, -+boolean SubbandLayer1Stereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { - SubbandLayer1::put_next_sample (channels, filter1, filter2); -@@ -256,7 +256,7 @@ bool SubbandLayer1Stereo::put_next_sampl - channel2_scalefactor; - #ifdef DEBUG - if (sample2 < -1.0 || sample2 > 1.0) -- cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; -+ std::cerr << "WARNING: rescaled subband sample is not in [-1.0, 1.0]\n"; - // this should never occur - #endif - if (channels == both) 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 81f58632fabf..000000000000 --- a/audio/maplay/files/patch-subband__layer__1.h +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 deleted file mode 100644 index e0ad1297cde8..000000000000 --- a/audio/maplay/files/patch-subband__layer__2.cc +++ /dev/null @@ -1,54 +0,0 @@ ---- 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 deleted file mode 100644 index b1ee79319de7..000000000000 --- a/audio/maplay/files/patch-subband__layer__2.h +++ /dev/null @@ -1,47 +0,0 @@ ---- 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-synthesis__filter.h b/audio/maplay/files/patch-synthesis__filter.h deleted file mode 100644 index 652fe31d9165..000000000000 --- a/audio/maplay/files/patch-synthesis__filter.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - --#include <iostream.h> -+#include <iostream> - #include "all.h" - #include "obuffer.h" - diff --git a/audio/maplay/pkg-descr b/audio/maplay/pkg-descr deleted file mode 100644 index 7122dccdf0fa..000000000000 --- a/audio/maplay/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -The audio part of the MPEG standard specifies three layers, whereat each -layer specifies its own file format. All three layers are using similar -audio coding techniques, but they vary in efficiency and complexity. -Layer I needs the fewest calculation time for en-/decoding a stream, layer III -the most. But a layer I MPEG audio stream is bigger than a layer III stream -at the same quality. This program is able to decode and play only layer I -and II streams, layer III is not supported (yet?!?). - -The maplay decodes layer I and layer II MPEG audio streams and plays them -using a CD-quality audio device or sends the to stdout normally as 16 bit -signed PCM values, interleaved for stereo streams. - -This player supports all modes, which are single channel, stereo, -joint stereo and dual channel, and all bitrates except free mode. -The missing free mode support should not be a problem for now, -because I haven't seen such a stream yet. - -LICENSE: GPL2 or later |