diff --git a/ChangeLog b/ChangeLog index 00a115a65a..e01307b91f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-11-22 Edward Hervey + + * docs/gst/gstreamer-sections.txt: + * gst/Makefile.am: + * gst/gst.h: + * gst/gsturitype.c: + * gst/gsturitype.h: + * gst/gstutils.c: (gst_util_set_object_arg): + * tools/gst-compprep.c: (main): + * tools/gst-inspect.c: (print_element_properties_info): + Removed GstURI , closes bug #321061 + 2005-11-22 Jan Schmidt * check/gst/gststructure.c: (GST_START_TEST): diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index f002619ad5..4abfc163cb 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1996,7 +1996,6 @@ gst_type_find_factory_get_type GstUriHandler GstURIHandler GstURIHandlerInterface -GstURIType GST_URI_TYPE_IS_VALID gst_uri_protocol_is_valid gst_uri_is_valid @@ -2016,11 +2015,9 @@ GST_IS_URI_HANDLER GST_URI_HANDLER_CLASS GST_URI_HANDLER_GET_INTERFACE GST_TYPE_URI_HANDLER -GST_TYPE_URI GST_TYPE_URI_TYPE gst_uri_handler_get_type -gst_uri_get_uri_type gst_uri_type_get_type diff --git a/gst/Makefile.am b/gst/Makefile.am index e93efaff57..c97a464ed5 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -123,7 +123,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ gsttypefind.c \ gsttypefindfactory.c \ $(GST_URI_SRC) \ - gsturitype.c \ gstutils.c \ gstvalue.c \ $(GST_PARSE_SRC) \ @@ -205,7 +204,6 @@ gst_headers = \ gsttypefind.h \ gsttypefindfactory.h \ gsturi.h \ - gsturitype.h \ gstutils.h \ gstvalue.h \ gstregistry.h \ diff --git a/gst/gst.h b/gst/gst.h index 2bce4d414a..55f5df92dd 100644 --- a/gst/gst.h +++ b/gst/gst.h @@ -64,7 +64,6 @@ #include #include #include -#include #include #include #include diff --git a/gst/gsturitype.c b/gst/gsturitype.c deleted file mode 100644 index 065d065ce4..0000000000 --- a/gst/gsturitype.c +++ /dev/null @@ -1,55 +0,0 @@ -/* GStreamer - * Copyright (C) 1999,2000 Erik Walthinsen - * 2000 Wim Taymans - * - * gsturi.c: register URI handlers - * - * 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. - */ - -/** - * SECTION:gsturitype - * @short_description: Describes URI types - * - */ - -#include "gst_private.h" - -#include "gsturi.h" -#include "gstinfo.h" - -GType -gst_uri_get_uri_type (void) -{ - static GType uri_type = 0; - - if (!uri_type) { - static const GTypeInfo uri_info = { - 0, - NULL, - NULL, - NULL, - NULL, - NULL, - 0, - 0, - NULL, - NULL - }; - uri_type = g_type_register_static (G_TYPE_STRING, "GstUri", &uri_info, 0); - } - return uri_type; -} diff --git a/gst/gsturitype.h b/gst/gsturitype.h deleted file mode 100644 index 8a48ecf3e0..0000000000 --- a/gst/gsturitype.h +++ /dev/null @@ -1,37 +0,0 @@ -/* GStreamer - * Copyright (C) 1999,2000 Erik Walthinsen - * 2000 Wim Taymans - * - * gsturi.h: Header for uri to element mappings - * - * 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_URI_TYPE_H__ -#define __GST_URI_TYPE_H__ - -#include - -G_BEGIN_DECLS - -/* a static type for making uri element properties */ -#define GST_TYPE_URI (gst_uri_get_uri_type()) -GType gst_uri_get_uri_type (void); - -G_END_DECLS - -#endif /* __GST_URI_TYPE_H */ diff --git a/gst/gstutils.c b/gst/gstutils.c index 49b13835df..7853e178fa 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -33,7 +33,6 @@ #include "gst_private.h" #include "gstghostpad.h" #include "gstutils.h" -#include "gsturitype.h" #include "gstinfo.h" #include "gst-i18n-lib.h" @@ -291,8 +290,6 @@ gst_util_set_object_arg (GObject * object, const gchar * name, sscanf_ret = sscanf (value, "%d", &i); g_return_if_fail (sscanf_ret == 1); g_object_set (G_OBJECT (object), name, i, NULL); - } else if (paramspec->value_type == GST_TYPE_URI) { - g_object_set (G_OBJECT (object), name, value, NULL); } break; } diff --git a/tools/gst-compprep.c b/tools/gst-compprep.c index c74e52310a..d48495f701 100644 --- a/tools/gst-compprep.c +++ b/tools/gst-compprep.c @@ -103,9 +103,7 @@ main (int argc, char *argv[]) argnode = xmlNewChild (factorynode, NULL, (xmlChar *) "argument", (xmlChar *) param->name); - if (param->value_type == GST_TYPE_URI) { - xmlNewChild (argnode, NULL, (xmlChar *) "filename", NULL); - } else if (G_IS_PARAM_SPEC_ENUM (param) == G_TYPE_ENUM) { + if (G_IS_PARAM_SPEC_ENUM (param) == G_TYPE_ENUM) { GEnumValue *values; gint j; diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c index b789e85298..8ea664f1ca 100644 --- a/tools/gst-inspect.c +++ b/tools/gst-inspect.c @@ -425,9 +425,6 @@ print_element_properties_info (GstElement * element) break; } default: - if (param->value_type == GST_TYPE_URI) { - n_print ("%-23.23s URI", ""); - } if (param->value_type == GST_TYPE_CAPS) { const GstCaps *caps = gst_value_get_caps (&value);