1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
$NetBSD: patch-an,v 1.2 2004/01/18 13:59:25 mrauch Exp $
--- 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];
|
