Removed gst_bin_change_state_type it doesn't work and the concept is outdated, we'll find something better soon..

Original commit message from CVS:
Removed gst_bin_change_state_type it doesn't work and the concept is
outdated, we'll find something better soon..
This commit is contained in:
Wim Taymans 2002-07-24 20:37:09 +00:00
parent 29ae46b307
commit de12c3557a
2 changed files with 8 additions and 66 deletions

View file

@ -46,9 +46,6 @@ static void gst_bin_dispose (GObject * object);
static GstElementStateReturn gst_bin_change_state (GstElement *element);
static GstElementStateReturn gst_bin_change_state_norecurse (GstBin *bin);
static gboolean gst_bin_change_state_type (GstBin *bin,
GstElementState state,
GType type);
static gboolean gst_bin_iterate_func (GstBin * bin);
@ -125,7 +122,6 @@ gst_bin_class_init (GstBinClass * klass)
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_bin_change_state);
klass->change_state_type = GST_DEBUG_FUNCPTR (gst_bin_change_state_type);
klass->iterate = GST_DEBUG_FUNCPTR (gst_bin_iterate_func);
}
@ -591,62 +587,6 @@ gst_bin_change_state_norecurse (GstBin * bin)
return GST_STATE_FAILURE;
}
static gboolean
gst_bin_change_state_type (GstBin * bin, GstElementState state, GType type)
{
GList *children;
GstElement *child;
g_return_val_if_fail (GST_IS_BIN (bin), FALSE);
g_return_val_if_fail (bin->numchildren != 0, FALSE);
children = bin->children;
while (children) {
child = GST_ELEMENT (children->data);
if (GST_IS_BIN (child)) {
if (!gst_bin_set_state_type (GST_BIN (child), state, type))
return FALSE;
}
else if (G_TYPE_CHECK_INSTANCE_TYPE (child, type)) {
if (!gst_element_set_state (child, state))
return FALSE;
}
children = g_list_next (children);
}
if (type == GST_TYPE_BIN)
gst_element_set_state (GST_ELEMENT (bin), state);
return TRUE;
}
/**
* gst_bin_set_state_type:
* @bin: #GstBin to set the state
* @state: the new state to set the elements to
* @type: the type of elements to change
*
* Sets the state of only those objects of the given type.
*
* Returns: indication if the state change was successfull
*/
gboolean
gst_bin_set_state_type (GstBin * bin, GstElementState state, GType type)
{
GstBinClass *oclass;
GST_DEBUG (GST_CAT_STATES, "gst_bin_set_state_type(\"%s\",%d,%s)",
GST_ELEMENT_NAME (bin), state, G_OBJECT_TYPE_NAME (type));
g_return_val_if_fail (bin != NULL, FALSE);
g_return_val_if_fail (GST_IS_BIN (bin), FALSE);
oclass = GST_BIN_CLASS (G_OBJECT_GET_CLASS (bin));
if (oclass->change_state_type)
(oclass->change_state_type) (bin, state, type);
return TRUE;
}
static void
gst_bin_dispose (GObject * object)
{
@ -903,6 +843,10 @@ void
gst_bin_set_pre_iterate_function (GstBin *bin, GstBinPrePostIterateFunction func, gpointer func_data)
{
g_return_if_fail (GST_IS_BIN (bin));
if (!GST_FLAG_IS_SET (bin, GST_BIN_FLAG_MANAGER))
g_warning ("setting pre_iterate on a non MANAGER bin has no effect");
bin->pre_iterate_func = func;
bin->pre_iterate_private = func_data;
}
@ -920,6 +864,10 @@ void
gst_bin_set_post_iterate_function (GstBin *bin, GstBinPrePostIterateFunction func, gpointer func_data)
{
g_return_if_fail (GST_IS_BIN (bin));
if (!GST_FLAG_IS_SET (bin, GST_BIN_FLAG_MANAGER))
g_warning ("setting post_iterate on a non MANAGER bin has no effect");
bin->post_iterate_func = func;
bin->post_iterate_private = func_data;
}

View file

@ -94,10 +94,6 @@ struct _GstBinClass {
void (*object_added) (GstObject *object, GstObject *child);
void (*object_removed) (GstObject *object, GstObject *child);
/* change the state of elements of the given type */
gboolean (*change_state_type) (GstBin *bin,
GstElementState state,
GType type);
/* run a full iteration of operation */
gboolean (*iterate) (GstBin *bin);
};
@ -116,8 +112,6 @@ GstElement* gst_bin_get_by_name (GstBin *bin, const gchar *name);
GstElement* gst_bin_get_by_name_recurse_up (GstBin *bin, const gchar *name);
const GList* gst_bin_get_list (GstBin *bin);
gboolean gst_bin_set_state_type (GstBin *bin, GstElementState state, GType type);
gboolean gst_bin_iterate (GstBin *bin);
void gst_bin_use_clock (GstBin *bin, GstClock *clock);