diff --git a/ChangeLog b/ChangeLog index cab0e2d2f1..80df0054cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-11-27 Thomas Vander Stichele + + * gst-libs/gst/net/Makefile.am: + * gst-libs/gst/rtp/Makefile.am: + * gst-libs/gst/tag/Makefile.am: + remove silly include + * gst/tags/Makefile.am: + * gst/tags/gsttagediting.c: + * gst/tags/gsttageditingprivate.h: + * gst/tags/tagedit.vcproj: + remove directory, is as good as empty + 2005-11-27 Thomas Vander Stichele * configure.ac: diff --git a/gst-libs/gst/net/Makefile.am b/gst-libs/gst/net/Makefile.am index 0822f9af04..be0dcdc4f8 100644 --- a/gst-libs/gst/net/Makefile.am +++ b/gst-libs/gst/net/Makefile.am @@ -5,7 +5,6 @@ libgstnetinclude_HEADERS = gstnetbuffer.h lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c -# FIXME: what is that include doing here ??? -libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags +libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am index 0822f9af04..be0dcdc4f8 100644 --- a/gst-libs/gst/netbuffer/Makefile.am +++ b/gst-libs/gst/netbuffer/Makefile.am @@ -5,7 +5,6 @@ libgstnetinclude_HEADERS = gstnetbuffer.h lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c -# FIXME: what is that include doing here ??? -libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags +libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index 77d8d68a89..ea02606c58 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -10,7 +10,6 @@ libgstrtp_@GST_MAJORMINOR@_la_SOURCES = gstrtpbuffer.c \ gstbasertppayload.c \ gstbasertpdepayload.c -# FIXME: what is that include doing here ? -libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags +libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstrtp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index 8e62e5afd5..721fb62174 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -7,7 +7,7 @@ libgsttaginclude_HEADERS = \ lib_LTLIBRARIES = libgsttag-@GST_MAJORMINOR@.la libgsttag_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gstid3tag.c -libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags +libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgsttag_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst/tags/Makefile.am b/gst/tags/Makefile.am deleted file mode 100644 index fbd53d2405..0000000000 --- a/gst/tags/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -plugin_LTLIBRARIES = libgsttagedit.la - -libgsttagedit_la_SOURCES = gsttagediting.c -libgsttagedit_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags -libgsttagedit_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgsttagedit_la_LIBADD = $(GST_LIBS) - -noinst_HEADERS = gsttageditingprivate.h diff --git a/gst/tags/gsttagediting.c b/gst/tags/gsttagediting.c deleted file mode 100644 index 8ed7d4bd3b..0000000000 --- a/gst/tags/gsttagediting.c +++ /dev/null @@ -1,44 +0,0 @@ -/* GStreamer - * Copyright (C) 2003 Benjamin Otte - * - * gsttagediting.c: tag editing plugin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "gsttageditingprivate.h" -#include - -static gboolean -plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "vorbistag", - GST_RANK_PRIMARY, gst_vorbis_tag_get_type ())) { - return FALSE; - } - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gsttags", - "elements for manipulating data from ogg streams", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/tags/gsttageditingprivate.h b/gst/tags/gsttageditingprivate.h deleted file mode 100644 index 04ae4f8277..0000000000 --- a/gst/tags/gsttageditingprivate.h +++ /dev/null @@ -1,41 +0,0 @@ -/* GStreamer - * Copyright (C) 2003 Benjamin Otte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#ifndef __GST_TAG_EDIT_PRIVATE_H__ -#define __GST_TAG_EDIT_PRIVATE_H__ - -#include - -G_BEGIN_DECLS - - -typedef struct _GstTagEntryMatch GstTagEntryMatch; -struct _GstTagEntryMatch { - gchar * gstreamer_tag; - gchar * original_tag; -}; - - -GType gst_vorbis_tag_get_type (void); - - -G_END_DECLS - -#endif /* __GST_TAG_EDIT_PRIVATE_H__ */ diff --git a/gst/tags/tagedit.vcproj b/gst/tags/tagedit.vcproj deleted file mode 100644 index 274527d3a3..0000000000 --- a/gst/tags/tagedit.vcproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -