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-ao | |
| 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-ao')
| -rw-r--r-- | audio/maplay/files/patch-ao | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/audio/maplay/files/patch-ao b/audio/maplay/files/patch-ao new file mode 100644 index 000000000000..313ab9b2c1fb --- /dev/null +++ b/audio/maplay/files/patch-ao @@ -0,0 +1,82 @@ +*** subband_layer_2.h.orig Thu Jun 23 21:14:40 1994 +--- subband_layer_2.h Thu Dec 9 05:32:19 1999 +*************** +*** 55,62 **** + void read_allocation (Ibitstream *, Header *, Crc16 *); + virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *); +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); + }; + + +--- 55,62 ---- + void read_allocation (Ibitstream *, Header *, Crc16 *); + virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *); +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); + }; + + +*************** +*** 75,85 **** + } + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *stream) + { + return SubbandLayer2::read_sampledata (stream); + } +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +--- 75,85 ---- + } + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer2::read_sampledata (stream); + } +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +*************** +*** 90,96 **** + uint32 channel2_allocation; + uint32 channel2_scfsi; + real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; +! bool channel2_grouping; + uint32 channel2_codelength; + const real *channel2_groupingtable; + real channel2_factor; +--- 90,96 ---- + uint32 channel2_allocation; + uint32 channel2_scfsi; + real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; +! boolean channel2_grouping; + uint32 channel2_codelength; + const real *channel2_groupingtable; + real channel2_factor; +*************** +*** 102,109 **** + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *); +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif +--- 102,109 ---- + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *); +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif |