mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
gobject2gtk.h: added g2g_object_get_type() prototype gst.c: fixed gst_add_paths_func() prototype gstelement.c: change...
Original commit message from CVS: gobject2gtk.h: added g2g_object_get_type() prototype gst.c: fixed gst_add_paths_func() prototype gstelement.c: changed some prototypes, added a cast
This commit is contained in:
parent
4cb6d1ad0f
commit
18c6ade4d8
3 changed files with 7 additions and 5 deletions
|
@ -86,6 +86,8 @@ G_STMT_START{ \
|
||||||
#define g_enum_register_static gtk_type_register_enum
|
#define g_enum_register_static gtk_type_register_enum
|
||||||
|
|
||||||
|
|
||||||
|
GType g2g_object_get_type (void);
|
||||||
|
|
||||||
/*********************************
|
/*********************************
|
||||||
* FIXME API NOT in glib2.0
|
* FIXME API NOT in glib2.0
|
||||||
***********************************/
|
***********************************/
|
||||||
|
|
|
@ -107,7 +107,7 @@ gst_init (int *argc, char **argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_add_paths_func (gchar *pathlist)
|
gst_add_paths_func (const gchar *pathlist)
|
||||||
{
|
{
|
||||||
gchar **paths;
|
gchar **paths;
|
||||||
gint j = 0;
|
gint j = 0;
|
||||||
|
|
|
@ -51,8 +51,8 @@ static void gst_element_class_init (GstElementClass *klass);
|
||||||
static void gst_element_init (GstElement *element);
|
static void gst_element_init (GstElement *element);
|
||||||
static void gst_element_base_class_init (GstElementClass *klass);
|
static void gst_element_base_class_init (GstElementClass *klass);
|
||||||
|
|
||||||
static void gst_element_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
static void gst_element_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
||||||
static void gst_element_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
static void gst_element_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
|
||||||
|
|
||||||
static void gst_element_shutdown (GObject *object);
|
static void gst_element_shutdown (GObject *object);
|
||||||
static void gst_element_real_destroy (GObject *object);
|
static void gst_element_real_destroy (GObject *object);
|
||||||
|
@ -191,7 +191,7 @@ gst_element_set_property (GObject *object, guint prop_id, const GValue *value, G
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_element_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
|
gst_element_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
GstElementClass *oclass = (GstElementClass *)G_OBJECT_GET_CLASS(object);
|
GstElementClass *oclass = (GstElementClass *)G_OBJECT_GET_CLASS(object);
|
||||||
|
|
||||||
|
@ -900,7 +900,7 @@ gst_element_shutdown (GObject *object)
|
||||||
gst_bin_remove (GST_BIN (GST_OBJECT_PARENT (element)), element);
|
gst_bin_remove (GST_BIN (GST_OBJECT_PARENT (element)), element);
|
||||||
|
|
||||||
if (G_OBJECT_CLASS (parent_class)->shutdown)
|
if (G_OBJECT_CLASS (parent_class)->shutdown)
|
||||||
G_OBJECT_CLASS (parent_class)->shutdown (object);
|
G_OBJECT_CLASS (parent_class)->shutdown ((GObject *)object);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in a new issue