summaryrefslogtreecommitdiff
path: root/audio/mpg321
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mpg321')
-rw-r--r--audio/mpg321/files/patch-ao.c4
-rw-r--r--audio/mpg321/files/patch-mpg321.c24
-rw-r--r--audio/mpg321/files/patch-network.c4
3 files changed, 16 insertions, 16 deletions
diff --git a/audio/mpg321/files/patch-ao.c b/audio/mpg321/files/patch-ao.c
index 46f3c0555576..385c1ffbc4ce 100644
--- a/audio/mpg321/files/patch-ao.c
+++ b/audio/mpg321/files/patch-ao.c
@@ -1,6 +1,6 @@
---- ao.c.orig
+--- ao.c.orig 2002-03-24 05:49:47 UTC
+++ ao.c
-@@ -229,6 +229,7 @@
+@@ -229,6 +229,7 @@ void open_ao_playdevice(struct mad_heade
and restore it afterwards */
signal(SIGINT, SIG_DFL);
diff --git a/audio/mpg321/files/patch-mpg321.c b/audio/mpg321/files/patch-mpg321.c
index df561df237a5..f89d23a317df 100644
--- a/audio/mpg321/files/patch-mpg321.c
+++ b/audio/mpg321/files/patch-mpg321.c
@@ -1,6 +1,6 @@
---- mpg321.c.orig
+--- mpg321.c.orig 2002-03-24 05:49:20 UTC
+++ mpg321.c
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ static int show_id3(struct id3_tag const
else
{
@@ -9,7 +9,7 @@
free(names[i]);
}
}
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ static int show_id3(struct id3_tag const
if (!names[i]) {
fprintf (stderr, emptystring);
} else {
@@ -18,7 +18,7 @@
free (names[i]);
}
if (i%2) fprintf (stderr, "\n");
-@@ -285,6 +285,8 @@
+@@ -285,6 +285,8 @@ int main(int argc, char *argv[])
signal(SIGINT, SIG_DFL);
playbuf.buf = NULL;
@@ -27,7 +27,7 @@
playbuf.fd = -1;
playbuf.length = 0;
playbuf.done = 0;
-@@ -410,12 +412,14 @@
+@@ -410,12 +412,14 @@ int main(int argc, char *argv[])
if(fstat(fd, &stat) == -1)
{
@@ -42,7 +42,7 @@
continue;
}
-@@ -432,6 +436,7 @@
+@@ -432,6 +436,7 @@ int main(int argc, char *argv[])
if((playbuf.buf = mmap(0, playbuf.length, PROT_READ, MAP_SHARED, fd, 0))
== MAP_FAILED)
{
@@ -50,7 +50,7 @@
mpg321_error(currentfile);
continue;
}
-@@ -509,9 +514,6 @@
+@@ -509,9 +514,6 @@ int main(int argc, char *argv[])
mad_decoder_finish(&decoder);
@@ -60,7 +60,7 @@
if (playbuf.frames)
free(playbuf.frames);
-@@ -521,6 +523,7 @@
+@@ -521,6 +523,7 @@ int main(int argc, char *argv[])
if (playbuf.fd == -1)
{
munmap(playbuf.buf, playbuf.length);
@@ -68,14 +68,14 @@
}
else
-@@ -535,10 +538,6 @@
- ao_close(playdevice);
+@@ -536,10 +539,6 @@ int main(int argc, char *argv[])
ao_shutdown();
--
+
-#if defined(RAW_SUPPORT) || defined(HTTP_SUPPORT) || defined(FTP_SUPPORT)
- if(fd) close(fd);
-#endif
-
+-
return(0);
}
+
diff --git a/audio/mpg321/files/patch-network.c b/audio/mpg321/files/patch-network.c
index eba18f6bbdd5..508a5f259693 100644
--- a/audio/mpg321/files/patch-network.c
+++ b/audio/mpg321/files/patch-network.c
@@ -1,6 +1,6 @@
---- network.c.orig
+--- network.c.orig 2002-03-24 05:49:56 UTC
+++ network.c
-@@ -225,7 +225,8 @@
+@@ -225,7 +225,8 @@ int http_open(char *arg)
* a html page and not the stream */
snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n"
/* "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */