diff options
Diffstat (limited to 'audio/maplay/patches/patch-al')
| -rw-r--r-- | audio/maplay/patches/patch-al | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/audio/maplay/patches/patch-al b/audio/maplay/patches/patch-al index efa9324de16..34f2afa2e46 100644 --- a/audio/maplay/patches/patch-al +++ b/audio/maplay/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ +$NetBSD: patch-al,v 1.2 2004/01/18 13:59:25 mrauch Exp $ ---- 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 @@ +--- subband_layer_1.cc.orig 1994-06-23 14:14:36.000000000 +0200 ++++ subband_layer_1.cc +@@ -86,7 +86,7 @@ void SubbandLayer1::read_scalefactor (Ib } @@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ { if (allocation) { -@@ -105,7 +105,7 @@ +@@ -105,10 +105,10 @@ bool SubbandLayer1::read_sampledata (Ibi } @@ -19,8 +19,12 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ +boolean SubbandLayer1::put_next_sample (e_channels channels, SynthesisFilter *filter1, SynthesisFilter *) { - if (allocation && channels != right) -@@ -142,7 +142,7 @@ +- if (allocation && channels != right) ++ if (allocation && channels != maplay_right) + { + register real scaled_sample = (sample * factor + offset) * scalefactor; + #ifdef DEBUG +@@ -142,7 +142,7 @@ void SubbandLayer1IntensityStereo::read_ } @@ -29,7 +33,16 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ SynthesisFilter *filter1, SynthesisFilter *filter2) { if (allocation) -@@ -231,9 +231,9 @@ +@@ -160,7 +160,7 @@ bool SubbandLayer1IntensityStereo::put_n + 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 +@@ -231,9 +231,9 @@ void SubbandLayer1Stereo::read_scalefact } @@ -41,7 +54,7 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ if (channel2_allocation) { channel2_sample = real (stream->get_bits (channel2_samplelength)); -@@ -246,7 +246,7 @@ +@@ -246,11 +246,11 @@ bool SubbandLayer1Stereo::read_sampledat } @@ -50,3 +63,8 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ 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; |