From 80a61322efbced07792e16bead6ccf25e93c7c89 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Tue, 20 Apr 2004 23:03:28 +0000 Subject: [PATCH] ext/mad/gstid3tag.c: Add stdlib.h Original commit message from CVS: reviewed by David Schleef * ext/mad/gstid3tag.c: Add stdlib.h * gst/rtp/gstrtpgsmenc.c: same * gst/tags/gstid3tag.c: same * gst/udp/gstudpsrc.c: (gst_udpsrc_get): Fix GST_DISABLE_LOADSAVE * gst/tcp/gsttcpsink.c: (gst_tcpsink_sink_link): Adjust GST_DISABLE_LOADSAVE use. * gst/udp/gstudpsink.c: (gst_udpsink_sink_link): Likewise. * gst/tcp/gsttcpsrc.c: (gst_tcpsrc_get): Likewise. * ext/gnomevfs/gstgnomevfssrc.c: Include (needed by atol(3)). * sys/oss/gstosselement.h: Include (needed for dev_t). * gst/tags/gstvorbistag.c: Include (needed by strtoul(3)). * gst/rtp/gstrtpL16enc.c: Include (needed by random(3)). * ext/mad/Makefile.am: (libgstmad_la_CFLAGS): Add $(MAD_CFLAGS) $(ID3_CFLAGS). * ext/libfame/Makefile.am: (libgstlibfame_la_CFLAGS): Add $(LIBFAME_CFLAGS). --- ChangeLog | 23 +++++++++++++++++++++++ common | 2 +- ext/gnomevfs/gstgnomevfssrc.c | 1 + gst/tags/gstid3tag.c | 1 + gst/tcp/gsttcpsink.c | 9 ++++++--- gst/tcp/gsttcpsrc.c | 7 +++++++ 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6438a5712..ec5772e7d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2004-04-20 Daniel Gazard + + reviewed by David Schleef + + * ext/mad/gstid3tag.c: Add stdlib.h + * gst/rtp/gstrtpgsmenc.c: same + * gst/tags/gstid3tag.c: same + * gst/udp/gstudpsrc.c: (gst_udpsrc_get): Fix GST_DISABLE_LOADSAVE + * gst/tcp/gsttcpsink.c: (gst_tcpsink_sink_link): Adjust + GST_DISABLE_LOADSAVE use. + * gst/udp/gstudpsink.c: (gst_udpsink_sink_link): Likewise. + * gst/tcp/gsttcpsrc.c: (gst_tcpsrc_get): Likewise. + * ext/gnomevfs/gstgnomevfssrc.c: Include (needed by + atol(3)). + * sys/oss/gstosselement.h: Include (needed for dev_t). + * gst/tags/gstvorbistag.c: Include (needed by + strtoul(3)). + * gst/rtp/gstrtpL16enc.c: Include (needed by random(3)). + * ext/mad/Makefile.am: (libgstmad_la_CFLAGS): Add $(MAD_CFLAGS) + $(ID3_CFLAGS). + * ext/libfame/Makefile.am: (libgstlibfame_la_CFLAGS): Add + $(LIBFAME_CFLAGS). + 2004-04-20 David Schleef * gst/realmedia/rmdemux.c: This was supposed to part of the diff --git a/common b/common index e55182f6ee..63d93f0117 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e55182f6eece70ff99e33b9800b27a926670dbdd +Subproject commit 63d93f01177745ba864263f0b6f976212684cb87 diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c index e159e39d44..b10b4c36f3 100644 --- a/ext/gnomevfs/gstgnomevfssrc.c +++ b/ext/gnomevfs/gstgnomevfssrc.c @@ -34,6 +34,7 @@ #include "gstgnomevfs.h" +#include #include #include #include diff --git a/gst/tags/gstid3tag.c b/gst/tags/gstid3tag.c index 64db2eac95..327ec84248 100644 --- a/gst/tags/gstid3tag.c +++ b/gst/tags/gstid3tag.c @@ -24,6 +24,7 @@ #endif #include "gsttageditingprivate.h" +#include #include static const gchar *genres[] = { diff --git a/gst/tcp/gsttcpsink.c b/gst/tcp/gsttcpsink.c index 0f77692669..a9211d4a3a 100644 --- a/gst/tcp/gsttcpsink.c +++ b/gst/tcp/gsttcpsink.c @@ -155,18 +155,20 @@ static GstPadLinkReturn gst_tcpsink_sink_link (GstPad * pad, const GstCaps * caps) { GstTCPSink *tcpsink; + +#ifndef GST_DISABLE_LOADSAVE struct sockaddr_in serv_addr; struct in_addr addr; struct hostent *he; int fd; FILE *f; - -#ifndef GST_DISABLE_LOADSAVE xmlDocPtr doc; +#endif tcpsink = GST_TCPSINK (gst_pad_get_parent (pad)); switch (tcpsink->control) { +#ifndef GST_DISABLE_LOADSAVE case CONTROL_TCP: memset (&serv_addr, 0, sizeof (serv_addr)); @@ -216,8 +218,9 @@ gst_tcpsink_sink_link (GstPad * pad, const GstCaps * caps) xmlDocDump (f, doc); fclose (f); close (fd); -#endif break; + +#endif case CONTROL_NONE: return GST_PAD_LINK_OK; break; diff --git a/gst/tcp/gsttcpsrc.c b/gst/tcp/gsttcpsrc.c index e76214e6c6..478c8aa2cb 100644 --- a/gst/tcp/gsttcpsrc.c +++ b/gst/tcp/gsttcpsrc.c @@ -188,7 +188,10 @@ gst_tcpsrc_get (GstPad * pad) gint numbytes; fd_set read_fds; guint max_sock; + +#ifndef GST_DISABLE_LOADSAVE int ret, client_sock; +#endif struct sockaddr client_addr; g_return_val_if_fail (pad != NULL, NULL); @@ -217,8 +220,12 @@ gst_tcpsrc_get (GstPad * pad) if ((tcpsrc->control_sock != -1) && FD_ISSET (tcpsrc->control_sock, &read_fds)) { guchar *buf = NULL; + +#ifndef GST_DISABLE_LOADSAVE xmlDocPtr doc; GstCaps *caps; +#endif + switch (tcpsrc->control) { case CONTROL_TCP: