summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2011-11-13 20:56:02 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2011-11-13 20:56:02 +0000
commit7652df73524327e3f59c38bdcf420a84fc0dbcb6 (patch)
tree95de5b1c6d06a3491c14b60e4c2ebc7d1ccfdd86
parentd3560cc9a61a6e161daaea078e361e49d00924a7 (diff)
urihandler: fix return type of _get_uri_type()
Return a GstURIType and not a plain guint.
-rw-r--r--gst/gstelementfactory.c2
-rw-r--r--gst/gstelementfactory.h5
-rw-r--r--gst/gsturi.h3
3 files changed, 5 insertions, 5 deletions
diff --git a/gst/gstelementfactory.c b/gst/gstelementfactory.c
index 5c14a3260..18431d0b3 100644
--- a/gst/gstelementfactory.c
+++ b/gst/gstelementfactory.c
@@ -557,7 +557,7 @@ gst_element_factory_get_static_pad_templates (GstElementFactory * factory)
*
* Returns: type of URIs this element supports
*/
-gint
+GstURIType
gst_element_factory_get_uri_type (GstElementFactory * factory)
{
g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), GST_URI_UNKNOWN);
diff --git a/gst/gstelementfactory.h b/gst/gstelementfactory.h
index 474af3b72..a7ecec58e 100644
--- a/gst/gstelementfactory.h
+++ b/gst/gstelementfactory.h
@@ -34,6 +34,7 @@ typedef struct _GstElementFactoryClass GstElementFactoryClass;
#include <gst/gstpluginfeature.h>
#include <gst/gstpadtemplate.h>
#include <gst/gstiterator.h>
+#include <gst/gsturi.h>
G_BEGIN_DECLS
@@ -62,7 +63,7 @@ struct _GstElementFactory {
guint numpadtemplates;
/* URI interface stuff */
- guint uri_type;
+ GstURIType uri_type;
gchar ** uri_protocols;
GList * interfaces; /* interface type names this element implements */
@@ -88,7 +89,7 @@ const gchar * gst_element_factory_get_metadata (GstElementFacto
guint gst_element_factory_get_num_pad_templates (GstElementFactory *factory);
const GList * gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
-gint gst_element_factory_get_uri_type (GstElementFactory *factory);
+GstURIType gst_element_factory_get_uri_type (GstElementFactory *factory);
gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory);
gboolean gst_element_factory_has_interface (GstElementFactory *factory,
diff --git a/gst/gsturi.h b/gst/gsturi.h
index aedadc0d5..7435fc740 100644
--- a/gst/gsturi.h
+++ b/gst/gsturi.h
@@ -26,7 +26,6 @@
#include <glib.h>
#include <gst/gstelement.h>
-#include <gst/gstpluginfeature.h>
G_BEGIN_DECLS
@@ -144,7 +143,7 @@ GstElement * gst_element_make_from_uri (const GstURIType type,
/* accessing the interface */
GType gst_uri_handler_get_type (void);
-guint gst_uri_handler_get_uri_type (GstURIHandler * handler);
+GstURIType gst_uri_handler_get_uri_type (GstURIHandler * handler);
gchar ** gst_uri_handler_get_protocols (GstURIHandler * handler);
gchar * gst_uri_handler_get_uri (GstURIHandler * handler);
gboolean gst_uri_handler_set_uri (GstURIHandler * handler,