From: <cy...@ke...> - 2008-02-29 14:23:25
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: cymacs Date: Fri Feb 29 2008 14:23:31 UTC Log message: * gst/gsturi.c: (gst_uri_handler_get_protocols): Use the get_protocols_full vfunc if get_protocols is NULL. Fixes URIHandlers implemented using language bindings. Modified files: . : ChangeLog gst : gsturi.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3694&r2=1.3695 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsturi.c.diff?r1=1.42&r2=1.43 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.3694 retrieving revision 1.3695 diff -u -d -r1.3694 -r1.3695 --- ChangeLog 29 Feb 2008 13:59:16 -0000 1.3694 +++ ChangeLog 29 Feb 2008 14:23:16 -0000 1.3695 @@ -1,3 +1,9 @@ +2008-02-29 Rene Stadler <ma...@re...> + + * gst/gsturi.c: (gst_uri_handler_get_protocols): + Use the get_protocols_full vfunc if get_protocols is NULL. Fixes + URIHandlers implemented using language bindings. 2008-02-29 Sebastian Dröge <sl...@ci...> * gst/gstelementfactory.h: Index: gsturi.c RCS file: /cvs/gstreamer/gstreamer/gst/gsturi.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- gsturi.c 12 Sep 2007 12:36:51 -0000 1.42 +++ gsturi.c 29 Feb 2008 14:23:17 -0000 1.43 @@ -662,8 +662,14 @@ iface = GST_URI_HANDLER_GET_INTERFACE (handler); g_return_val_if_fail (iface != NULL, NULL); - g_return_val_if_fail (iface->get_protocols != NULL, NULL); - ret = iface->get_protocols (); + g_return_val_if_fail (iface->get_protocols != NULL || + iface->get_protocols_full != NULL, NULL); + if (iface->get_protocols != NULL) { + ret = iface->get_protocols (); + } else { + ret = iface->get_protocols_full (G_OBJECT_TYPE (handler)); + } g_return_val_if_fail (ret != NULL, NULL); return ret; |