mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/gstelementfactory.c
	gst/gstelementfactory.h
	gst/gstpad.h
	gst/gstpluginfeature.c
	gst/gstpluginfeature.h
This commit is contained in:
Wim Taymans 2011-06-10 12:09:49 +02:00
commit 2d28891528
22 changed files with 62 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/gstelement.h
View file

@ -767,8 +767,7 @@ gboolean gst_element_seek (GstElement *element, gd
GstFormat format, GstSeekFlags flags,
GstSeekType cur_type, gint64 cur,
GstSeekType stop_type, gint64 stop);
G_CONST_RETURN GstQueryType*
gst_element_get_query_types (GstElement *element);
const GstQueryType* gst_element_get_query_types (GstElement *element);
gboolean gst_element_query (GstElement *element, GstQuery *query);
/* messages */

4
gst/gstelementfactory.c
View file

@ -504,7 +504,7 @@ gst_element_factory_get_element_type (GstElementFactory * factory)
return factory->type;
}
G_CONST_RETURN gchar *
const gchar *
gst_element_factory_get_metadata (GstElementFactory * factory,
const gchar * key)
{
@ -557,7 +557,7 @@ __gst_element_factory_add_interface (GstElementFactory * elementfactory,
* Returns: (transfer none) (element-type Gst.StaticPadTemplate): the
* static pad templates
*/
G_CONST_RETURN GList *
const GList *
gst_element_factory_get_static_pad_templates (GstElementFactory * factory)
{
g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);

4
gst/gstelementfactory.h
View file

@ -83,10 +83,10 @@ GstElementFactory * gst_element_factory_find (const gchar *na
GType gst_element_factory_get_element_type (GstElementFactory *factory);
G_CONST_RETURN gchar * gst_element_factory_get_metadata (GstElementFactory *factory, const gchar *key);
const gchar * gst_element_factory_get_metadata (GstElementFactory *factory, const gchar *key);
guint gst_element_factory_get_num_pad_templates (GstElementFactory *factory);
G_CONST_RETURN GList * gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
const GList * gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
gint gst_element_factory_get_uri_type (GstElementFactory *factory);
gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory);

2
gst/gstformat.h
View file

@ -104,7 +104,7 @@ GstFormat gst_format_get_by_nick (const gchar *nick);
gboolean gst_formats_contains (const GstFormat *formats, GstFormat format);
/* query for format details */
G_CONST_RETURN GstFormatDefinition*
const GstFormatDefinition*
gst_format_get_details (GstFormat format);
GstIterator* gst_format_iterate_definitions (void);

6
gst/gstinfo.c
View file

@ -1788,7 +1788,7 @@ gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level,
{
}
G_CONST_RETURN gchar *
const gchar *
gst_debug_level_get_name (GstDebugLevel level)
{
return "NONE";
@ -1876,7 +1876,7 @@ gst_debug_category_get_threshold (GstDebugCategory * category)
return GST_LEVEL_NONE;
}
G_CONST_RETURN gchar *
const gchar *
gst_debug_category_get_name (GstDebugCategory * category)
{
return "";
@ -1888,7 +1888,7 @@ gst_debug_category_get_color (GstDebugCategory * category)
return 0;
}
G_CONST_RETURN gchar *
const gchar *
gst_debug_category_get_description (GstDebugCategory * category)
{
return "";

11
gst/gstinfo.h
View file

@ -317,7 +317,7 @@ typedef void (* GstDebugFuncPtr) (void);
/* do no use these functions, use the GST_DEBUG*_FUNCPTR macros */
void _gst_debug_register_funcptr (GstDebugFuncPtr func,
const gchar * ptrname);
G_CONST_RETURN gchar *
const gchar *
_gst_debug_nameof_funcptr (GstDebugFuncPtr func) G_GNUC_NO_INSTRUMENT;
@ -332,8 +332,7 @@ void gst_debug_log_default (GstDebugCategory * category,
GstDebugMessage * message,
gpointer unused) G_GNUC_NO_INSTRUMENT;
G_CONST_RETURN gchar *
gst_debug_level_get_name (GstDebugLevel level);
const gchar * gst_debug_level_get_name (GstDebugLevel level);
void gst_debug_add_log_function (GstLogFunction func,
gpointer data);
@ -359,11 +358,9 @@ void gst_debug_category_set_threshold (GstDebugCategory * catego
GstDebugLevel level);
void gst_debug_category_reset_threshold (GstDebugCategory * category);
GstDebugLevel gst_debug_category_get_threshold (GstDebugCategory * category);
G_CONST_RETURN gchar *
gst_debug_category_get_name (GstDebugCategory * category);
const gchar * gst_debug_category_get_name (GstDebugCategory * category);
guint gst_debug_category_get_color (GstDebugCategory * category);
G_CONST_RETURN gchar *
gst_debug_category_get_description (GstDebugCategory * category);
const gchar * gst_debug_category_get_description (GstDebugCategory * category);
GSList * gst_debug_get_all_categories (void);

2
gst/gstpad.c
View file

@ -183,7 +183,7 @@ static GstFlowQuarks flow_quarks[] = {
*
* Returns: a static string with the name of the flow return.
*/
G_CONST_RETURN gchar *
const gchar *
gst_flow_get_name (GstFlowReturn ret)
{
gint i;

8
gst/gstpad.h
View file

@ -165,7 +165,7 @@ typedef enum {
GST_FLOW_CUSTOM_ERROR_2 = -102
} GstFlowReturn;
G_CONST_RETURN gchar* gst_flow_get_name (GstFlowReturn ret);
const gchar* gst_flow_get_name (GstFlowReturn ret);
GQuark gst_flow_to_quark (GstFlowReturn ret);
/**
@ -912,10 +912,8 @@ GstIterator * gst_pad_iterate_internal_links_default (GstPad * pad);
/* generic query function */
void gst_pad_set_query_type_function (GstPad *pad, GstPadQueryTypeFunction type_func);
G_CONST_RETURN GstQueryType*
gst_pad_get_query_types (GstPad *pad);
G_CONST_RETURN GstQueryType*
gst_pad_get_query_types_default (GstPad *pad);
const GstQueryType* gst_pad_get_query_types (GstPad *pad);
const GstQueryType* gst_pad_get_query_types_default (GstPad *pad);
gboolean gst_pad_query (GstPad *pad, GstQuery *query);
gboolean gst_pad_peer_query (GstPad *pad, GstQuery *query);

22
gst/gstplugin.c
View file

@ -883,7 +883,7 @@ gst_plugin_get_name (GstPlugin * plugin)
*
* Returns: the long name of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_description (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -899,7 +899,7 @@ gst_plugin_get_description (GstPlugin * plugin)
*
* Returns: the filename of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_filename (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -915,7 +915,7 @@ gst_plugin_get_filename (GstPlugin * plugin)
*
* Returns: the version of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_version (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -931,7 +931,7 @@ gst_plugin_get_version (GstPlugin * plugin)
*
* Returns: the license of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_license (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -947,7 +947,7 @@ gst_plugin_get_license (GstPlugin * plugin)
*
* Returns: the source of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_source (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -963,7 +963,7 @@ gst_plugin_get_source (GstPlugin * plugin)
*
* Returns: the package of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_package (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -979,7 +979,7 @@ gst_plugin_get_package (GstPlugin * plugin)
*
* Returns: the origin of the plugin
*/
G_CONST_RETURN gchar *
const gchar *
gst_plugin_get_origin (GstPlugin * plugin)
{
g_return_val_if_fail (plugin != NULL, NULL);
@ -1032,7 +1032,7 @@ gst_plugin_is_loaded (GstPlugin * plugin)
*
* Since: 0.10.24
*/
G_CONST_RETURN GstStructure *
const GstStructure *
gst_plugin_get_cache_data (GstPlugin * plugin)
{
g_return_val_if_fail (GST_IS_PLUGIN (plugin), NULL);
@ -1538,7 +1538,7 @@ gst_plugin_ext_dep_scan_dir_and_match_names (GstPlugin * plugin,
GDir *dir;
guint hash = 0;
recurse_dirs = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
recurse_dirs = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
dir = g_dir_open (path, 0, &err);
if (dir == NULL) {
@ -1600,8 +1600,8 @@ gst_plugin_ext_dep_scan_path_with_filenames (GstPlugin * plugin,
if (filenames == NULL || *filenames == NULL)
filenames = empty_filenames;
recurse_into_dirs = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
partial_names = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX);
recurse_into_dirs = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
partial_names = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX);
/* if we can construct the exact paths to check with the data we have, just
* stat them one by one; this is more efficient than opening the directory

18
gst/gstplugin.h
View file

@ -320,15 +320,15 @@ gboolean gst_plugin_register_static_full (gint major_version,
const gchar *origin,
gpointer user_data);
G_CONST_RETURN gchar* gst_plugin_get_name (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_description (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_filename (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_version (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_license (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_source (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_package (GstPlugin *plugin);
G_CONST_RETURN gchar* gst_plugin_get_origin (GstPlugin *plugin);
G_CONST_RETURN GstStructure* gst_plugin_get_cache_data (GstPlugin * plugin);
const gchar* gst_plugin_get_name (GstPlugin *plugin);
const gchar* gst_plugin_get_description (GstPlugin *plugin);
const gchar* gst_plugin_get_filename (GstPlugin *plugin);
const gchar* gst_plugin_get_version (GstPlugin *plugin);
const gchar* gst_plugin_get_license (GstPlugin *plugin);
const gchar* gst_plugin_get_source (GstPlugin *plugin);
const gchar* gst_plugin_get_package (GstPlugin *plugin);
const gchar* gst_plugin_get_origin (GstPlugin *plugin);
const GstStructure* gst_plugin_get_cache_data (GstPlugin * plugin);
void gst_plugin_set_cache_data (GstPlugin * plugin, GstStructure *cache_data);
GModule * gst_plugin_get_module (GstPlugin *plugin);

2
gst/gstquery.h
View file

@ -170,7 +170,7 @@ gboolean gst_query_types_contains (const GstQueryType *types,
/* query for query details */
G_CONST_RETURN GstQueryTypeDefinition*
const GstQueryTypeDefinition*
gst_query_type_get_details (GstQueryType type);
GstIterator* gst_query_type_iterate_definitions (void);

8
gst/gststructure.h
View file

@ -99,7 +99,7 @@ gboolean gst_structure_set_parent_refcount (GstStructure *structure
gint *refcount);
void gst_structure_free (GstStructure *structure);
G_CONST_RETURN gchar * gst_structure_get_name (const GstStructure *structure);
const gchar * gst_structure_get_name (const GstStructure *structure);
GQuark gst_structure_get_name_id (const GstStructure *structure);
gboolean gst_structure_has_name (const GstStructure *structure,
const gchar *name);
@ -150,9 +150,9 @@ gboolean gst_structure_id_get (const GstStructure
GQuark first_field_id,
...) G_GNUC_NULL_TERMINATED;
G_CONST_RETURN GValue * gst_structure_id_get_value (const GstStructure *structure,
const GValue * gst_structure_id_get_value (const GstStructure *structure,
GQuark field);
G_CONST_RETURN GValue * gst_structure_get_value (const GstStructure *structure,
const GValue * gst_structure_get_value (const GstStructure *structure,
const gchar *fieldname);
void gst_structure_remove_field (GstStructure *structure,
const gchar *fieldname);
@ -210,7 +210,7 @@ gboolean gst_structure_get_date_time (const GstStructure
gboolean gst_structure_get_clock_time (const GstStructure *structure,
const gchar *fieldname,
GstClockTime *value);
G_CONST_RETURN gchar * gst_structure_get_string (const GstStructure *structure,
const gchar * gst_structure_get_string (const GstStructure *structure,
const gchar *fieldname);
gboolean gst_structure_get_enum (const GstStructure *structure,
const gchar *fieldname,

2
gst/gsttaglist.c
View file

@ -1152,7 +1152,7 @@ gst_tag_list_foreach (const GstTagList * list, GstTagForeachFunc func,
* Returns: (transfer none): The GValue for the specified entry or NULL if the
* tag wasn't available or the tag doesn't have as many entries
*/
G_CONST_RETURN GValue *
const GValue *
gst_tag_list_get_value_index (const GstTagList * list, const gchar * tag,
guint index)
{

6
gst/gsttaglist.h
View file

@ -205,8 +205,8 @@ void gst_tag_merge_strings_with_comma (GValue * dest, const GValue * src);
/* basic tag support */
gboolean gst_tag_exists (const gchar * tag);
GType gst_tag_get_type (const gchar * tag);
G_CONST_RETURN gchar * gst_tag_get_nick (const gchar * tag);
G_CONST_RETURN gchar * gst_tag_get_description (const gchar * tag);
const gchar * gst_tag_get_nick (const gchar * tag);
const gchar * gst_tag_get_description (const gchar * tag);
GstTagFlag gst_tag_get_flag (const gchar * tag);
gboolean gst_tag_is_fixed (const gchar * tag);
@ -253,7 +253,7 @@ void gst_tag_list_foreach (const GstTagList * list,
GstTagForeachFunc func,
gpointer user_data);
G_CONST_RETURN GValue *
const GValue *
gst_tag_list_get_value_index (const GstTagList * list,
const gchar * tag,
guint index);

2
gst/gsttagsetter.c
View file

@ -365,7 +365,7 @@ gst_tag_setter_add_tag_value (GstTagSetter * setter,
* Returns: (transfer none): a current snapshot of the taglist used in the
* setter or NULL if none is used.
*/
G_CONST_RETURN GstTagList *
const GstTagList *
gst_tag_setter_get_tag_list (GstTagSetter * setter)
{
g_return_val_if_fail (GST_IS_TAG_SETTER (setter), NULL);

2
gst/gsttagsetter.h
View file

@ -88,7 +88,7 @@ void gst_tag_setter_add_tag_value (GstTagSetter * setter,
const gchar * tag,
const GValue * value);
G_CONST_RETURN GstTagList *
const GstTagList *
gst_tag_setter_get_tag_list (GstTagSetter * setter);
void gst_tag_setter_set_tag_merge_mode (GstTagSetter * setter,

2
gst/gsttrace.h
View file

@ -125,7 +125,7 @@ void gst_trace_read_tsc (gint64 *dst);
extern GStaticMutex _gst_trace_mutex;
gboolean gst_alloc_trace_available (void);
G_CONST_RETURN GList* gst_alloc_trace_list (void);
const GList* gst_alloc_trace_list (void);
GstAllocTrace* _gst_alloc_trace_register (const gchar *name);
int gst_alloc_trace_live_all (void);

2
gst/gsturi.c
View file

@ -711,7 +711,7 @@ gst_uri_handler_get_protocols (GstURIHandler * handler)
* Returns NULL if there are no URI currently handled. The
* returned string must not be modified or freed.
*/
G_CONST_RETURN gchar *
const gchar *
gst_uri_handler_get_uri (GstURIHandler * handler)
{
GstURIHandlerInterface *iface;

5
gst/gsturi.h
View file

@ -106,7 +106,7 @@ struct _GstURIHandlerInterface {
gchar ** (* get_protocols) (void);
/* 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);
@ -145,8 +145,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,

4
gst/gstutils.c
View file

@ -1226,7 +1226,7 @@ gst_element_get_compatible_pad (GstElement * element, GstPad * pad,
*
* Returns: (transfer none): a string with the name of the state.
*/
G_CONST_RETURN gchar *
const gchar *
gst_element_state_get_name (GstState state)
{
switch (state) {
@ -1257,7 +1257,7 @@ gst_element_state_get_name (GstState state)
*
* Since: 0.10.11
*/
G_CONST_RETURN gchar *
const gchar *
gst_element_state_change_return_get_name (GstStateChangeReturn state_ret)
{
switch (state_ret) {

4
gst/gstutils.h
View file

@ -690,8 +690,8 @@ GstPad* gst_element_get_compatible_pad (GstElement *element, Gs
GstPadTemplate* gst_element_get_compatible_pad_template (GstElement *element, GstPadTemplate *compattempl);
G_CONST_RETURN gchar* gst_element_state_get_name (GstState state);
G_CONST_RETURN gchar * gst_element_state_change_return_get_name (GstStateChangeReturn state_ret);
const gchar* gst_element_state_get_name (GstState state);
const gchar * gst_element_state_change_return_get_name (GstStateChangeReturn state_ret);
gboolean gst_element_link (GstElement *src, GstElement *dest);
gboolean gst_element_link_many (GstElement *element_1,

14
gst/gstvalue.h
View file

@ -470,8 +470,7 @@ void gst_value_list_merge (GValue *dest,
const GValue *value1,
const GValue *value2);
guint gst_value_list_get_size (const GValue *value);
G_CONST_RETURN GValue *
gst_value_list_get_value (const GValue *value,
const GValue * gst_value_list_get_value (const GValue *value,
guint index);
/* array */
@ -480,8 +479,7 @@ void gst_value_array_append_value (GValue *value,
void gst_value_array_prepend_value (GValue *value,
const GValue *prepend_value);
guint gst_value_array_get_size (const GValue *value);
G_CONST_RETURN GValue *
gst_value_array_get_value (const GValue *value,
const GValue * gst_value_array_get_value (const GValue *value,
guint index);
/* fourcc */
@ -511,13 +509,12 @@ gdouble gst_value_get_double_range_min (const GValue *value);
gdouble gst_value_get_double_range_max (const GValue *value);
/* caps */
G_CONST_RETURN GstCaps *
gst_value_get_caps (const GValue *value);
const GstCaps * gst_value_get_caps (const GValue *value);
void gst_value_set_caps (GValue *value,
const GstCaps *caps);
/* structure */
G_CONST_RETURN GstStructure *
const GstStructure *
gst_value_get_structure (const GValue *value);
void gst_value_set_structure (GValue *value,
const GstStructure *structure);
@ -548,8 +545,7 @@ const GValue *gst_value_get_fraction_range_min (const GValue *value);
const GValue *gst_value_get_fraction_range_max (const GValue *value);
/* date */
G_CONST_RETURN GDate *
gst_value_get_date (const GValue *value);
const GDate * gst_value_get_date (const GValue *value);
void gst_value_set_date (GValue *value,
const GDate *date);