aboutsummaryrefslogtreecommitdiff
path: root/audio/amp/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/amp/files')
-rw-r--r--audio/amp/files/patch-audio.c10
-rw-r--r--audio/amp/files/patch-audio.h12
-rw-r--r--audio/amp/files/patch-audioIO__Linux.c (renamed from audio/amp/files/patch-audioIO_Linux.c)8
-rw-r--r--audio/amp/files/patch-dump.c6
-rw-r--r--audio/amp/files/patch-formats.c6
-rw-r--r--audio/amp/files/patch-getbits.c10
-rw-r--r--audio/amp/files/patch-guicontrol.c6
-rw-r--r--audio/amp/files/patch-layer2.c6
-rw-r--r--audio/amp/files/patch-layer3.c8
-rw-r--r--audio/amp/files/patch-position.c8
-rw-r--r--audio/amp/files/patch-rtbuf.c6
11 files changed, 43 insertions, 43 deletions
diff --git a/audio/amp/files/patch-audio.c b/audio/amp/files/patch-audio.c
index ba8aed625001..660fc47bcb3c 100644
--- a/audio/amp/files/patch-audio.c
+++ b/audio/amp/files/patch-audio.c
@@ -1,6 +1,6 @@
---- audio.c Sat Aug 23 08:30:21 1997
-+++ audio.c Wed Apr 13 00:22:25 2005
-@@ -56,7 +56,7 @@
+--- audio.c.orig 1997-08-23 11:30:21 UTC
++++ audio.c
+@@ -56,7 +56,7 @@ void statusDisplay(struct AUDIO_HEADER *
msg("{ %d } ",frameNo);
}
if (A_SHOW_TIME && !(frameNo%10)) {
@@ -9,7 +9,7 @@
minutes=seconds/60;
seconds=seconds % 60;
msg("[%d:%02d]",minutes,seconds);
-@@ -245,10 +245,6 @@
+@@ -245,10 +245,6 @@ void report_header_error(int err)
switch (err) {
case GETHDR_ERR: die("error reading mpeg bitstream. exiting.\n");
break;
@@ -20,7 +20,7 @@
case GETHDR_FL1: warn("ISO/MPEG layer 1 is not supported by amp (yet).\n");
break;
case GETHDR_FF : warn("free format bitstreams are not supported. sorry.\n");
-@@ -268,10 +264,10 @@
+@@ -268,10 +264,10 @@ int setup_audio(struct AUDIO_HEADER *hea
{
if (A_AUDIO_PLAY)
if (AUDIO_BUFFER_SIZE==0)
diff --git a/audio/amp/files/patch-audio.h b/audio/amp/files/patch-audio.h
index 88940fd95be2..e21d86cdf946 100644
--- a/audio/amp/files/patch-audio.h
+++ b/audio/amp/files/patch-audio.h
@@ -1,5 +1,5 @@
---- audio.h Thu Aug 21 10:00:18 1997
-+++ audio.h Wed Apr 13 00:21:47 2005
+--- audio.h.orig 1997-08-21 13:00:18 UTC
++++ audio.h
@@ -9,6 +9,7 @@
#include <stdio.h>
@@ -8,7 +8,7 @@
int ID;
int layer;
int protection_bit;
-@@ -55,8 +56,8 @@
+@@ -55,8 +56,8 @@ extern void report_header_error(int err)
extern int scalefac_l[2][2][22];
extern int scalefac_s[2][2][13][3];
@@ -19,7 +19,7 @@
extern short t_bitrate[2][3][15];
extern int is[2][578];
-@@ -64,7 +65,7 @@
+@@ -64,7 +65,7 @@ extern float xr[2][32][18];
extern int *t_l,*t_s;
extern int nch;
@@ -28,7 +28,7 @@
extern int A_QUIET,A_SHOW_CNT,A_FORMAT_WAVE,A_DUMP_BINARY;
extern int A_WRITE_TO_AUDIO,A_WRITE_TO_FILE;
-@@ -106,9 +107,14 @@
+@@ -106,9 +107,14 @@ float xr[2][32][18];
int *t_l,*t_s;
int nch;
@@ -46,7 +46,7 @@
};
/* GUI control stuff */
-@@ -143,28 +149,47 @@
+@@ -143,28 +149,47 @@ short t_bitrate[2][3][15] = {{
/* the last sfb is given implicitly on pg.28. of the standard. scalefactors
* for that one are 0, pretab also
*/
diff --git a/audio/amp/files/patch-audioIO_Linux.c b/audio/amp/files/patch-audioIO__Linux.c
index b5d69bf22062..a11446effe43 100644
--- a/audio/amp/files/patch-audioIO_Linux.c
+++ b/audio/amp/files/patch-audioIO__Linux.c
@@ -1,5 +1,5 @@
---- audioIO_Linux.c.orig Sat May 31 10:47:58 1997
-+++ audioIO_Linux.c Fri Aug 23 14:46:27 2002
+--- audioIO_Linux.c.orig 1997-05-31 17:47:58 UTC
++++ audioIO_Linux.c
@@ -21,12 +21,14 @@
#ifdef HAVE_MACHINE_SOUNDCARD_H
#include <machine/soundcard.h>
@@ -16,7 +16,7 @@
/* declare these static to effectively isolate the audio device */
-@@ -42,6 +44,9 @@
+@@ -42,6 +44,9 @@ static int volumeIoctl;
void
audioOpen(int frequency, int stereo, int volume)
{
@@ -26,7 +26,7 @@
int supportedMixers, play_format=AFMT_S16_LE;
if ((audio_fd = open ("/dev/dsp", O_WRONLY, 0)) == -1)
-@@ -78,7 +83,12 @@
+@@ -78,7 +83,12 @@ audioOpen(int frequency, int stereo, int
if (volume != -1)
audioSetVolume(volume);
diff --git a/audio/amp/files/patch-dump.c b/audio/amp/files/patch-dump.c
index efefaa8c74be..2cb924ef1944 100644
--- a/audio/amp/files/patch-dump.c
+++ b/audio/amp/files/patch-dump.c
@@ -1,6 +1,6 @@
---- dump.c Sat May 31 17:19:38 1997
-+++ dump.c Wed Apr 13 00:21:47 2005
-@@ -46,19 +46,21 @@
+--- dump.c.orig 1997-05-31 20:19:38 UTC
++++ dump.c
+@@ -46,19 +46,21 @@ int _data,space=0;
void show_header(struct AUDIO_HEADER *header)
{
int bitrate=t_bitrate[header->ID][3-header->layer][header->bitrate_index];
diff --git a/audio/amp/files/patch-formats.c b/audio/amp/files/patch-formats.c
index 24028dceee75..57f6ddb0a4cc 100644
--- a/audio/amp/files/patch-formats.c
+++ b/audio/amp/files/patch-formats.c
@@ -1,6 +1,6 @@
---- formats.c Sat May 31 14:47:58 1997
-+++ formats.c Wed Apr 13 00:21:47 2005
-@@ -27,7 +27,7 @@
+--- formats.c.orig 1997-05-31 17:47:58 UTC
++++ formats.c
+@@ -27,7 +27,7 @@ unsigned char iza[8]={0x64 ,0x61 ,0x74 ,
int len,fs,i;
len=ftell(out_file)-44;
diff --git a/audio/amp/files/patch-getbits.c b/audio/amp/files/patch-getbits.c
index 65a78b07e73b..f1e28c2e0853 100644
--- a/audio/amp/files/patch-getbits.c
+++ b/audio/amp/files/patch-getbits.c
@@ -1,6 +1,6 @@
---- getbits.c Wed Aug 20 10:30:21 1997
-+++ getbits.c Wed Apr 13 00:21:47 2005
-@@ -91,6 +91,7 @@
+--- getbits.c.orig 1997-08-20 13:30:21 UTC
++++ getbits.c
+@@ -91,6 +91,7 @@ unsigned int getbits(int n)
*/
static inline void parse_header(struct AUDIO_HEADER *header)
{
@@ -8,7 +8,7 @@
header->ID=_getbits(1);
header->layer=_getbits(2);
header->protection_bit=_getbits(1);
-@@ -112,11 +113,17 @@
+@@ -112,11 +113,17 @@ static inline int header_sanity_check(st
header->bitrate_index==15 ||
header->sampling_frequency==3) return -1;
@@ -26,7 +26,7 @@
return 0;
}
-@@ -132,11 +139,7 @@
+@@ -132,11 +139,7 @@ struct AUDIO_HEADER tmp;
if ((retval=_fillbfr(4))!=0) return retval;
for(;;) {
diff --git a/audio/amp/files/patch-guicontrol.c b/audio/amp/files/patch-guicontrol.c
index c493c4297ca1..b32c284fb929 100644
--- a/audio/amp/files/patch-guicontrol.c
+++ b/audio/amp/files/patch-guicontrol.c
@@ -1,6 +1,6 @@
---- guicontrol.c.orig Fri Aug 6 17:54:38 2004
-+++ guicontrol.c Fri Aug 6 17:55:44 2004
-@@ -375,7 +375,8 @@
+--- guicontrol.c.orig 1997-08-23 11:30:51 UTC
++++ guicontrol.c
+@@ -375,7 +375,8 @@ int decodeMPEG_2(int inFilefd)
break;
case GETHDR_SYN: warn("oops, we're out of sync.\n");
break;
diff --git a/audio/amp/files/patch-layer2.c b/audio/amp/files/patch-layer2.c
index 98d27660e6f2..a127aaf76529 100644
--- a/audio/amp/files/patch-layer2.c
+++ b/audio/amp/files/patch-layer2.c
@@ -1,6 +1,6 @@
---- layer2.c Mon Jun 16 14:53:15 1997
-+++ layer2.c Wed Apr 13 00:21:47 2005
-@@ -34,7 +34,7 @@
+--- layer2.c.orig 1997-06-16 17:53:15 UTC
++++ layer2.c
+@@ -34,7 +34,7 @@ int hsize,fs,mean_frame_size;
if (header->protection_bit==0) hsize+=2;
bitrate=t_bitrate[header->ID][3-header->layer][header->bitrate_index];
diff --git a/audio/amp/files/patch-layer3.c b/audio/amp/files/patch-layer3.c
index 29291ac4f8c0..e00700b24df4 100644
--- a/audio/amp/files/patch-layer3.c
+++ b/audio/amp/files/patch-layer3.c
@@ -1,6 +1,6 @@
---- layer3.c Mon Aug 18 09:42:17 1997
-+++ layer3.c Wed Apr 13 00:21:47 2005
-@@ -61,7 +61,7 @@
+--- layer3.c.orig 1997-08-18 12:42:17 UTC
++++ layer3.c
+@@ -61,7 +61,7 @@ int mean_frame_size,bitrate,fs,hsize,ssi
/* MPEG2 only has one granule
*/
bitrate=t_bitrate[header->ID][3-header->layer][header->bitrate_index];
@@ -9,7 +9,7 @@
if (header->ID) mean_frame_size=144000*bitrate/fs;
else mean_frame_size=72000*bitrate/fs;
-@@ -96,8 +96,8 @@
+@@ -96,8 +96,8 @@ int mean_frame_size,bitrate,fs,hsize,ssi
/* these two should go away
*/
diff --git a/audio/amp/files/patch-position.c b/audio/amp/files/patch-position.c
index 2d6a169401fc..8c446f7e38ff 100644
--- a/audio/amp/files/patch-position.c
+++ b/audio/amp/files/patch-position.c
@@ -1,6 +1,6 @@
---- position.c Sat May 31 14:47:58 1997
-+++ position.c Wed Apr 13 00:21:47 2005
-@@ -40,7 +40,7 @@
+--- position.c.orig 1997-05-31 17:47:58 UTC
++++ position.c
+@@ -40,7 +40,7 @@ struct AUDIO_HEADER tmp;
}
bitrate=t_bitrate[tmp.ID][3-tmp.layer][tmp.bitrate_index];
@@ -9,7 +9,7 @@
if (tmp.ID) mean_frame_size=144000*bitrate/fs;
else mean_frame_size=72000*bitrate/fs;
fillbfr(mean_frame_size + tmp.padding_bit - hsize);
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ struct AUDIO_HEADER tmp;
* so we have to go back one frame + 4 bytes + 1 byte (in case padding was used).
*/
bitrate=t_bitrate[tmp.ID][3-tmp.layer][tmp.bitrate_index];
diff --git a/audio/amp/files/patch-rtbuf.c b/audio/amp/files/patch-rtbuf.c
index b9285dbb42c4..2700b2f62feb 100644
--- a/audio/amp/files/patch-rtbuf.c
+++ b/audio/amp/files/patch-rtbuf.c
@@ -1,6 +1,6 @@
---- rtbuf.c Sat Aug 23 07:16:40 1997
-+++ rtbuf.c Wed Apr 13 00:21:47 2005
-@@ -337,15 +337,15 @@
+--- rtbuf.c.orig 1997-08-23 10:16:40 UTC
++++ rtbuf.c
+@@ -337,15 +337,15 @@ int apar;
(mpegheader->mode != 3) ? "stereo" : "mono");
return -1;
}