diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
| commit | 238b9a57cc022aec7ebd52d908ac5e24d76c3183 (patch) | |
| tree | 9563e2353a2c427a40fae0e7de0ed73c2348c402 /gst/gstregistry.h | |
| parent | 90fff577f0661c1ec7a0f2c324d5b69d1d1d040e (diff) | |
| parent | cc5edeefcd7772ac645fa0b8b91cfe7be201d78a (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
gst/gstelement.c
gst/gstelement.h
gst/gstpad.c
gst/gstutils.c
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/dataprotocol/Makefile.am
libs/gst/net/Makefile.am
win32/common/libgstreamer.def
Diffstat (limited to 'gst/gstregistry.h')
| -rw-r--r-- | gst/gstregistry.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gst/gstregistry.h b/gst/gstregistry.h index 33301be25..c3aa9f480 100644 --- a/gst/gstregistry.h +++ b/gst/gstregistry.h @@ -119,7 +119,7 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c /** * gst_default_registry_add_plugin: - * @plugin: the plugin to add + * @plugin: (transfer full): the plugin to add * * Add the plugin to the default registry. * The plugin-added signal will be emitted. @@ -145,7 +145,8 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c * * Get the list of paths for the default registry. * - * Returns: A Glist of paths as strings. g_list_free after use. + * Returns: (transfer container) (element-type char*): a #GList of paths as + * strings. g_list_free() after use. */ #define gst_default_registry_get_path_list() \ gst_registry_get_path_list (gst_registry_get_default()) @@ -155,7 +156,8 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c * * Get a copy of all plugins registered in the default registry. * - * Returns: a copy of the list. Free after use. + * Returns: (transfer full) (element-type Gst.Plugin): a copy of the list. + * Free after use. */ #define gst_default_registry_get_plugin_list() \ gst_registry_get_plugin_list (gst_registry_get_default()) @@ -167,8 +169,8 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c * * Find the pluginfeature with the given name and type in the default registry. * - * Returns: The pluginfeature with the given name and type or NULL - * if the plugin was not found. + * Returns: (transfer full): the pluginfeature with the given name and type or + * NULL if the plugin was not found. */ #define gst_default_registry_find_feature(name,type) \ gst_registry_find_feature (gst_registry_get_default(),name,type) @@ -180,7 +182,8 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c * Find the plugin with the given name in the default registry. * The plugin will be reffed; caller is responsible for unreffing. * - * Returns: The plugin with the given name or NULL if the plugin was not found. + * Returns: (transfer full): The plugin with the given name or NULL if the + * plugin was not found. */ #define gst_default_registry_find_plugin(name) \ gst_registry_find_plugin (gst_registry_get_default(),name) @@ -196,7 +199,8 @@ GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const c * If the first flag is set, only the first match is * returned (as a list with a single object). * - * Returns: a GList of plugin features, gst_plugin_feature_list_free after use. + * Returns: (transfer full) (element-type Gst.PluginFeature): a #GList of + * plugin features, gst_plugin_feature_list_free after use. */ #define gst_default_registry_feature_filter(filter,first,user_data) \ gst_registry_feature_filter (gst_registry_get_default(),filter,first,user_data) |