mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-01 01:33:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

uri: remove some _full variants

Browse source
This commit is contained in:
Wim Taymans 2011-06-22 16:38:04 +02:00
parent 6da2a33b7a
commit b322a401c7
7 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/gstelementfactory.c
View file

@ -267,19 +267,14 @@ gst_element_register (GstPlugin * plugin, const gchar * name, guint rank,
GstURIHandlerInterface *iface = (GstURIHandlerInterface *) GstURIHandlerInterface *iface = (GstURIHandlerInterface *)
g_type_interface_peek (klass, GST_TYPE_URI_HANDLER); g_type_interface_peek (klass, GST_TYPE_URI_HANDLER);
if (!iface || (!iface->get_type && !iface->get_type_full) || if (!iface || !iface->get_type || !iface->get_protocols)
(!iface->get_protocols && !iface->get_protocols_full))
goto urierror; goto urierror;
if (iface->get_type) if (iface->get_type)
factory->uri_type = iface->get_type (); factory->uri_type = iface->get_type (factory->type);
else if (iface->get_type_full)
factory->uri_type = iface->get_type_full (factory->type);
if (!GST_URI_TYPE_IS_VALID (factory->uri_type)) if (!GST_URI_TYPE_IS_VALID (factory->uri_type))
goto urierror; goto urierror;
if (iface->get_protocols) if (iface->get_protocols)
factory->uri_protocols = g_strdupv (iface->get_protocols ()); factory->uri_protocols = iface->get_protocols (factory->type);
else if (iface->get_protocols_full)
factory->uri_protocols = iface->get_protocols_full (factory->type);
if (!factory->uri_protocols) if (!factory->uri_protocols)
goto urierror; goto urierror;
} }

17
gst/gsturi.c
View file

@ -655,13 +655,9 @@ gst_uri_handler_get_uri_type (GstURIHandler * handler)
iface = GST_URI_HANDLER_GET_INTERFACE (handler); iface = GST_URI_HANDLER_GET_INTERFACE (handler);
g_return_val_if_fail (iface != NULL, GST_URI_UNKNOWN); g_return_val_if_fail (iface != NULL, GST_URI_UNKNOWN);
g_return_val_if_fail (iface->get_type != NULL g_return_val_if_fail (iface->get_type != NULL, GST_URI_UNKNOWN);
|| iface->get_type_full != NULL, GST_URI_UNKNOWN);
if (iface->get_type != NULL) ret = iface->get_type (G_OBJECT_TYPE (handler));
ret = iface->get_type ();
else
ret = iface->get_type_full (G_OBJECT_TYPE (handler));
g_return_val_if_fail (GST_URI_TYPE_IS_VALID (ret), GST_URI_UNKNOWN); g_return_val_if_fail (GST_URI_TYPE_IS_VALID (ret), GST_URI_UNKNOWN);
return ret; return ret;
@ -688,14 +684,9 @@ gst_uri_handler_get_protocols (GstURIHandler * handler)
iface = GST_URI_HANDLER_GET_INTERFACE (handler); iface = GST_URI_HANDLER_GET_INTERFACE (handler);
g_return_val_if_fail (iface != NULL, NULL); g_return_val_if_fail (iface != NULL, NULL);
g_return_val_if_fail (iface->get_protocols != NULL || g_return_val_if_fail (iface->get_protocols != NULL, NULL);
iface->get_protocols_full != NULL, NULL);
if (iface->get_protocols != NULL) { ret = iface->get_protocols (G_OBJECT_TYPE (handler));
ret = iface->get_protocols ();
} else {
ret = iface->get_protocols_full (G_OBJECT_TYPE (handler));
}
g_return_val_if_fail (ret != NULL, NULL); g_return_val_if_fail (ret != NULL, NULL);
return ret; return ret;

9
gst/gsturi.h
View file

@ -102,22 +102,19 @@ struct _GstURIHandlerInterface {
/*< public >*/ /*< public >*/
/* querying capabilities */ /* querying capabilities */
GstURIType (* get_type) (void); GstURIType (* get_type) (GType type);
gchar ** (* get_protocols) (void); gchar ** (* get_protocols) (GType type);
/* using the interface */ /* using the interface */
const gchar * (* get_uri) (GstURIHandler * handler); const gchar * (* get_uri) (GstURIHandler * handler);
gboolean (* set_uri) (GstURIHandler * handler, gboolean (* set_uri) (GstURIHandler * handler,
const gchar * uri); const gchar * uri);
GstURIType (* get_type_full) (GType type);
gchar ** (* get_protocols_full) (GType type);
/*< private >*/ /*< private >*/
/* we might want to add functions here to query features, /* we might want to add functions here to query features,
* someone with gnome-vfs knowledge go ahead */ * someone with gnome-vfs knowledge go ahead */
gpointer _gst_reserved[GST_PADDING - 2]; gpointer _gst_reserved[GST_PADDING];
}; };
/* general URI functions */ /* general URI functions */

4
plugins/elements/gstfdsink.c
View file

@ -581,13 +581,13 @@ seek_failed:
/*** GSTURIHANDLER INTERFACE *************************************************/ /*** GSTURIHANDLER INTERFACE *************************************************/
static GstURIType static GstURIType
gst_fd_sink_uri_get_type (void) gst_fd_sink_uri_get_type (GType type)
{ {
return GST_URI_SINK; return GST_URI_SINK;
} }
static gchar ** static gchar **
gst_fd_sink_uri_get_protocols (void) gst_fd_sink_uri_get_protocols (GType type)
{ {
static gchar *protocols[] = { (char *) "fd", NULL }; static gchar *protocols[] = { (char *) "fd", NULL };

4
plugins/elements/gstfdsrc.c
View file

@ -600,13 +600,13 @@ seek_failed:
/*** GSTURIHANDLER INTERFACE *************************************************/ /*** GSTURIHANDLER INTERFACE *************************************************/
static GstURIType static GstURIType
gst_fd_src_uri_get_type (void) gst_fd_src_uri_get_type (GType type)
{ {
return GST_URI_SRC; return GST_URI_SRC;
} }
static gchar ** static gchar **
gst_fd_src_uri_get_protocols (void) gst_fd_src_uri_get_protocols (GType type)
{ {
static gchar *protocols[] = { (char *) "fd", NULL }; static gchar *protocols[] = { (char *) "fd", NULL };

4
plugins/elements/gstfilesink.c
View file

@ -675,13 +675,13 @@ gst_file_sink_stop (GstBaseSink * basesink)
/*** GSTURIHANDLER INTERFACE *************************************************/ /*** GSTURIHANDLER INTERFACE *************************************************/
static GstURIType static GstURIType
gst_file_sink_uri_get_type (void) gst_file_sink_uri_get_type (GType type)
{ {
return GST_URI_SINK; return GST_URI_SINK;
} }
static gchar ** static gchar **
gst_file_sink_uri_get_protocols (void) gst_file_sink_uri_get_protocols (GType type)
{ {
static gchar *protocols[] = { (char *) "file", NULL }; static gchar *protocols[] = { (char *) "file", NULL };

4
plugins/elements/gstfilesrc.c
View file

@ -577,13 +577,13 @@ gst_file_src_stop (GstBaseSrc * basesrc)
/*** GSTURIHANDLER INTERFACE *************************************************/ /*** GSTURIHANDLER INTERFACE *************************************************/
static GstURIType static GstURIType
gst_file_src_uri_get_type (void) gst_file_src_uri_get_type (GType type)
{ {
return GST_URI_SRC; return GST_URI_SRC;
} }
static gchar ** static gchar **
gst_file_src_uri_get_protocols (void) gst_file_src_uri_get_protocols (GType type)
{ {
static gchar *protocols[] = { (char *) "file", NULL }; static gchar *protocols[] = { (char *) "file", NULL };