diff options
author | Steve Price <steve@FreeBSD.org> | 1999-12-23 18:44:10 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-12-23 18:44:10 +0000 |
commit | 20fe79de4b699bed34e61ff3232bf0d6aef8c815 (patch) | |
tree | 89f122097cb56723261e7af7dc9d16e0ee8ca499 /audio/maplay/files/patch-an | |
parent | Update to patchlevel j067.1. (diff) |
* Fixed patches not to change one file twice
* Rearrenged build target
PR: 15378
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'audio/maplay/files/patch-an')
-rw-r--r-- | audio/maplay/files/patch-an | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/audio/maplay/files/patch-an b/audio/maplay/files/patch-an new file mode 100644 index 000000000000..b30d8ad479a6 --- /dev/null +++ b/audio/maplay/files/patch-an @@ -0,0 +1,97 @@ +*** subband_layer_2.cc.orig Thu Jun 23 21:14:36 1994 +--- subband_layer_2.cc Thu Dec 9 05:32:19 1999 +*************** +*** 591,597 **** + } + + +! bool SubbandLayer2::read_sampledata (Ibitstream *stream) + { + if (allocation) + if (groupingtable) +--- 591,597 ---- + } + + +! boolean SubbandLayer2::read_sampledata (Ibitstream *stream) + { + if (allocation) + if (groupingtable) +*************** +*** 633,639 **** + } + + +! bool SubbandLayer2::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *) + { + #ifdef DEBUG +--- 633,639 ---- + } + + +! boolean SubbandLayer2::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *) + { + #ifdef DEBUG +*************** +*** 726,732 **** + } + + +! bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { + #ifdef DEBUG +--- 726,732 ---- + } + + +! boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { + #ifdef DEBUG +*************** +*** 880,888 **** + } + + +! bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) + { +! bool returnvalue = SubbandLayer2::read_sampledata (stream); + + if (channel2_allocation) + if (channel2_groupingtable) +--- 880,888 ---- + } + + +! boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) + { +! boolean returnvalue = SubbandLayer2::read_sampledata (stream); + + if (channel2_allocation) + if (channel2_groupingtable) +*************** +*** 919,928 **** + } + + +! bool 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) + { + register real sample = channel2_samples[samplenumber - 1]; +--- 919,928 ---- + } + + +! boolean SubbandLayer2Stereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { +! boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); + if (channel2_allocation && channels != left) + { + register real sample = channel2_samples[samplenumber - 1]; |