head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.116 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.114 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.112 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.110 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.108 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.106 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.104 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.102 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.100 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.98 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.96 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.94 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.92 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.90 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.88 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.86 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.84 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.82 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.80 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.78 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.76 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.74 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.72 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.68 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.48 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.70 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.66 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.64 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.62 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.60 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.58 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.56 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.54 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.52 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.50 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.46 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.44 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.42 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.40 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.38 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.36 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.34 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.32 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.30 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.28 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.26 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.24 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.22 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.20 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.18 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.16 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.12 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.2.0.66 pkgsrc-2011Q3-base:1.2 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.3 date 2011.11.22.20.57.35; author wiz; 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.21; author agc; state Exp; branches; next ; desc @@ 1.3 log @Unconditionalize the DragonFly patches for newer c++. Use patches instead of sed. Set LICENSE while here. @ text @$NetBSD: patch-al,v 1.2 2004/01/18 13:59:25 mrauch Exp $ --- subband_layer_1.cc.orig 1994-06-23 12:14:36.000000000 +0000 +++ 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,15 +105,15 @@@@ 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) + if (allocation && channels != maplay_right) { 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,18 +154,18 @@@@ 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); filter2->input_sample (sample2, subbandnumber); } - else if (channels == left) + else if (channels == maplay_left) { 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,32 +231,32 @@@@ 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); - if (channel2_allocation && channels != left) + if (channel2_allocation && channels != maplay_left) { register float sample2 = (channel2_sample * channel2_factor + channel2_offset) * 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) @ 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 1 a3 1 --- subband_layer_1.cc.orig 1994-06-23 14:14:36.000000000 +0200 d5 10 a14 1 @@@@ -86,7 +86,7 @@@@ void SubbandLayer1::read_scalefactor (Ib d23 9 a31 1 @@@@ -105,10 +105,10 @@@@ bool SubbandLayer1::read_sampledata (Ibi d44 6 d59 8 a66 1 @@@@ -160,7 +160,7 @@@@ bool SubbandLayer1IntensityStereo::put_n d75 25 a99 1 @@@@ -231,9 +231,9 @@@@ void SubbandLayer1Stereo::read_scalefact d111 7 a117 1 @@@@ -246,11 +246,11 @@@@ bool SubbandLayer1Stereo::read_sampledat d131 7 @ 1.1 log @Fix a compilation problem on 1.6 and above. Split patch files out into one file per patch-file. @ text @d3 3 a5 3 --- subband_layer_1.cc 2002/06/27 15:41:04 1.1 +++ subband_layer_1.cc 2002/06/27 15:41:40 @@@@ -86,7 +86,7 @@@@ d14 1 a14 1 @@@@ -105,7 +105,7 @@@@ d22 6 a27 2 if (allocation && channels != right) @@@@ -142,7 +142,7 @@@@ d36 10 a45 1 @@@@ -231,9 +231,9 @@@@ d57 1 a57 1 @@@@ -246,7 +246,7 @@@@ d66 5 @