head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.116 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.114 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.112 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.110 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.108 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.106 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.104 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.102 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.100 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.98 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.96 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.94 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.92 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.90 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.88 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.86 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.84 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.82 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.80 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.78 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.76 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.74 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.72 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.68 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.48 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.70 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.66 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.64 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.62 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.60 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.58 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.56 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.54 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.52 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.50 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.46 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.44 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.42 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.40 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.38 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.36 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.34 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.32 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.30 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.28 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.26 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.24 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.22 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.20 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.18 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.16 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.14 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.12 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.10 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.8 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.6 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.4 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.2 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.3.0.2 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.2.0.64 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.62 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.60 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.58 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.56 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.54 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.52 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.50 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.48 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.46 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.8 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.2 pkgviews-base:1.1; locks; strict; comment @# @; 1.5 date 2011.11.22.20.57.35; author wiz; state Exp; branches; next 1.4; 1.4 date 2011.11.22.16.37.01; author marino; state Exp; branches; next 1.3; 1.3 date 2011.08.29.00.04.07; author dholland; state Exp; branches; next 1.2; 1.2 date 2004.01.18.13.59.25; author mrauch; state Exp; branches; next 1.1; 1.1 date 2002.06.27.15.52.18; author agc; state Exp; branches; next ; desc @@ 1.5 log @Unconditionalize the DragonFly patches for newer c++. Use patches instead of sed. Set LICENSE while here. @ text @$NetBSD: patch-ah,v 1.4 2011/11/22 16:37:01 marino Exp $ --- maplay.cc.orig 1994-06-23 12:14:36.000000000 +0000 +++ maplay.cc @@@@ -31,16 +31,16 @@@@ * on an amd device or in stdout mode, if compiled with ULAW defined * - option -amd forces maplay to treat /dev/audio as an amd device * in the u-law version. This is helpful on some SPARC clones. - * - 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. */ #include #include #include #include -#include -#include +#include +#include #include "all.h" #include "crc.h" #include "header.h" @@@@ -54,14 +54,14 @@@@ // 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 +90,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 +146,12 @@@@ usage: #ifdef Solaris "SPARC Solaris 2.x" #else +#ifdef __FreeBSD__ + "FreeBSD" +#else +#ifdef __DragonFly__ + "DragonFly" +#else #ifdef LINUX "Linux" #else @@@@ -159,6 +165,8 @@@@ usage: #endif #endif #endif +#endif +#endif " version)\n" "@@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@@cs.tu-berlin.de)\n" "@@(#) Berlin University of Technology\n" @@@@ -180,10 +188,10 @@@@ usage: stdout_mode = True; break; case 'l': - which_channels = left; + which_channels = maplay_left; break; case 'r': - which_channels = right; + which_channels = maplay_right; break; #ifdef SPARC case 'u': @@@@ -216,7 +224,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,14 +251,14 @@@@ usage: header = new Header; if (!header->read_header (stream, &crc)) { - cerr << "no header found!\n"; + std::cerr << "no header found!\n"; Exit (1); } // get info from header of first frame: layer = header->layer (); if ((mode = header->mode ()) == single_channel) - which_channels = left; + which_channels = maplay_left; sample_frequency = header->sample_frequency (); // create filter(s): @@@@ -319,6 +327,17 @@@@ usage: Exit (0); } #else +#ifdef NETBSD + { + if (NetBSDObuffer::class_suitable (mode == single_channel || which_channels != both) ? 1 : 2) + if (mode == single_channel || which_channels != both) + buffer = new NetBSDObuffer (1, header); + else + buffer = new NetBSDObuffer (2, header); + else + Exit (0); + } +#else //#ifdef your_machine // { // if (mode == single_channel || which_channels != both) @@@@ -328,11 +347,12 @@@@ 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); } //#endif // !your_machine +#endif // !NETBSD #endif // !LINUX #endif // !SPARC #endif // !Indigo @@@@ -345,22 +365,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 +391,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 +443,7 @@@@ usage: } else { - cerr << "sorry, layer 3 not implemented!\n"; + std::cerr << "sorry, layer 3 not implemented!\n"; Exit (0); } @@@@ -463,7 +483,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 +501,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 occured!\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 +522,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; @ 1.4 log @audio/maplay: Fix DragonFly breakage This package has been broken at least since DragonFly moved to gcc44 for their base compiler. The previously deprecated "-m486" is no longer recognized, but the -march defaults to i486 now anyway, so this switch is no longer required. GCC 4.4 got rid of the iostream and iomanip backwards compatibility, so trying to include these headers is another source of breakage. While probably correct for all platforms, this commit conservatively only changes the build process for DragonFly since maplay apparently is building okay on NetBSD. No PKGREVISION bump is required. @ text @d1 1 a1 1 $NetBSD$ d5 21 d46 1 a46 1 @@@@ -90,10 +90,10 @@@@ static void Exit (int returncode) d59 6 d100 18 a117 1 @@@@ -250,7 +258,7 @@@@ usage: d144 7 a150 1 @@@@ -333,6 +352,7 @@@@ usage: d158 120 @ 1.3 log @main() needs a return type in clang-land. @ text @d1 1 a1 5 $NetBSD: patch-ah,v 1.2 2004/01/18 13:59:25 mrauch Exp $ - avoid assorted name conflicts - support NetBSD and FreeBSD - main() needs a return type d38 1 a38 1 @@@@ -146,6 +146,9 @@@@ usage: d45 3 d51 1 a51 1 @@@@ -159,6 +162,7 @@@@ usage: d56 1 d60 1 a60 1 @@@@ -180,10 +184,10 @@@@ usage: d73 1 a73 1 @@@@ -250,7 +254,7 @@@@ usage: d82 1 a82 1 @@@@ -319,6 +323,17 @@@@ usage: d100 1 a100 1 @@@@ -333,6 +348,7 @@@@ usage: @ 1.2 log @Fix compilation on -current (gcc3 issues). Use the original master tarball, not a copy from somewhere which isn't reachable any longer. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 1 --- maplay.cc.orig 1994-06-23 14:14:36.000000000 +0200 d29 6 a34 2 @@@@ -93,7 +93,7 @@@@ static void Exit (int returncode) main (int argc, char *argv[]) @ 1.1 log @Fix a compilation problem on 1.6 and above. Split patch files out into one file per patch-file. @ text @d3 2 a4 2 --- maplay.cc 2002/06/27 15:41:04 1.1 +++ maplay.cc 2002/06/27 15:41:40 d25 1 a25 1 @@@@ -93,7 +93,7 @@@@ d34 1 a34 1 @@@@ -146,6 +146,9 @@@@ d44 1 a44 1 @@@@ -159,6 +162,7 @@@@ d52 23 a74 1 @@@@ -319,6 +323,17 @@@@ d92 1 a92 1 @@@@ -333,6 +348,7 @@@@ @