head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.182
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.180
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.178
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.176
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.174
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.172
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.170
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.168
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.166
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.164
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.162
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.160
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.158
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.156
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.154
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.152
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.150
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.148
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.146
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.144
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.142
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.140
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.138
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.134
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.114
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.136
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.132
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.130
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.128
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.126
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.124
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.122
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.120
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.118
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.116
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.112
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.110
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.108
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.106
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.104
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.102
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.100
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.98
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.96
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.94
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.92
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.90
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.88
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.86
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.84
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.82
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.80
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.78
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.76
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.74
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.72
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.70
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.68
	pkgsrc-2011Q4-base:1.2
	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.2
date	2004.01.18.13.59.25;	author mrauch;	state Exp;
branches;
next	1.1;

1.1
date	2002.06.27.15.52.23;	author agc;	state Exp;
branches;
next	;


desc
@@


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
@$NetBSD$

--- subband_layer_2.cc.orig	1994-06-23 14:14:36.000000000 +0200
+++ 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
@@@@ -644,7 +644,7 @@@@ bool SubbandLayer2::put_next_sample (e_c
     exit (1);
   }
 #endif
-  if (allocation && channels != right)
+  if (allocation && channels != maplay_right)
   {
     register real sample = samples[samplenumber];
 
@@@@ -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
@@@@ -769,7 +769,7 @@@@ bool SubbandLayer2IntensityStereo::put_n
       filter1->input_sample (sample, subbandnumber);
       filter2->input_sample (sample2, subbandnumber);
     }
-    else if (channels == left)
+    else if (channels == maplay_left)
     {
       if (groupnumber <= 4)
 	sample *= scalefactor1;
@@@@ -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,11 +919,11 @@@@ 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);
-  if (channel2_allocation && channels != left)
+  boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2);
+  if (channel2_allocation && channels != maplay_left)
   {
     register real sample = channel2_samples[samplenumber - 1];
 
@


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_2.cc	2002/06/27 15:41:04	1.1
+++ subband_layer_2.cc	2002/06/27 15:41:40
@@@@ -591,7 +591,7 @@@@
d14 1
a14 1
@@@@ -633,7 +633,7 @@@@
d23 10
a32 1
@@@@ -726,7 +726,7 @@@@
d41 10
a50 1
@@@@ -880,9 +880,9 @@@@
d62 1
a62 1
@@@@ -919,10 +919,10 @@@@
d71 1
d73 1
a73 1
   if (channel2_allocation && channels != left)
d76 1
@