Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gsturi.h

diff --git a/gst/gsturi.h b/gst/gsturi.h
index 6193cf3..176d70e 100644 (file)
--- a/gst/gsturi.h
+++ b/gst/gsturi.h
@@ -74,14 +74,6 @@ typedef struct _GstURIHandlerInterface GstURIHandlerInterface;
  * @get_protocols: Method to return the list of protocols handled by the element.
  * @get_uri: Method to return the URI currently handled by the element.
  * @set_uri: Method to set a new URI.
- * @get_type_full: Variant of get_type which takes a GType argument. This is 
- *   for use by bindings that need to pass context when creating a URI Handler.
- *   If implemented, get_type will be used in preference to get_type_full.
- *   Since: 0.10.15.
- * @get_protocols_full: Variant of get_protocols which takes a GType argument.
- *   This is for use by bindings that need to pass context when creating a URI
- *   Handler. If implemented, get_protocols will be used in preference to
- *   get_protocols_full. Since: 0.10.15.
  *
  * Any #GstElement using this interface should implement these methods.
  */
@@ -102,22 +94,19 @@ struct _GstURIHandlerInterface {
 
   /*< public >*/
   /* querying capabilities */
-  GstURIType           (* get_type)            (void);
-  gchar **             (* get_protocols)       (void);
+  GstURIType           (* get_type)            (GType type);
+  gchar **             (* get_protocols)       (GType type);
 
   /* using the interface */
-  G_CONST_RETURN gchar *(* get_uri)            (GstURIHandler * handler);
+  const gchar *                (* get_uri)             (GstURIHandler * handler);
   gboolean             (* set_uri)             (GstURIHandler * handler,
                                                 const gchar *   uri);
 
-  GstURIType           (* get_type_full)       (GType type);
-  gchar **             (* get_protocols_full)  (GType type);
-
   /*< private >*/
   /* we might want to add functions here to query features,
    * someone with gnome-vfs knowledge go ahead */
 
-  gpointer _gst_reserved[GST_PADDING - 2];
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* general URI functions */
@@ -133,6 +122,9 @@ gchar *             gst_uri_get_location            (const gchar * uri);
 gchar *                gst_uri_construct               (const gchar * protocol,
                                                 const gchar * location);
 
+gchar *         gst_filename_to_uri             (const gchar * filename,
+                                                 GError     ** error);
+
 GstElement *   gst_element_make_from_uri       (const GstURIType type,
                                                 const gchar *    uri,
                                                 const gchar *    elementname);
@@ -142,8 +134,7 @@ GType               gst_uri_handler_get_type        (void);
 
 guint          gst_uri_handler_get_uri_type    (GstURIHandler * handler);
 gchar **       gst_uri_handler_get_protocols   (GstURIHandler * handler);
-G_CONST_RETURN
-gchar *                gst_uri_handler_get_uri         (GstURIHandler * handler);
+const gchar *  gst_uri_handler_get_uri         (GstURIHandler * handler);
 gboolean       gst_uri_handler_set_uri         (GstURIHandler * handler,
                                                 const gchar *   uri);
 void           gst_uri_handler_new_uri         (GstURIHandler * handler,