summaryrefslogtreecommitdiffstats
path: root/gst-libs
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2003-05-06 22:22:39 +0000
committerJulien Moutte <julien@moutte.net>2003-05-06 22:22:39 +0000
commit2ecac900f07a2dcda58b7542c20ab6c2541b71d5 (patch)
treed5846ea160bd8f22e8d35129e0f3380214f84a9d /gst-libs
parent5b879bd5b7c65b87236a0c122ac91dfb1e385087 (diff)
downloadgst-plugins-bad-2ecac900f07a2dcda58b7542c20ab6c2541b71d5.tar.gz
gst-plugins-bad-2ecac900f07a2dcda58b7542c20ab6c2541b71d5.tar.bz2
gst-plugins-bad-2ecac900f07a2dcda58b7542c20ab6c2541b71d5.zip
deep-notify can come from pads too, replacing GstElement by GstObject.
Original commit message from CVS: deep-notify can come from pads too, replacing GstElement by GstObject.
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/play/play.old.c14
-rw-r--r--gst-libs/gst/play/play.old.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c
index 8b022b6d..a256a8fa 100644
--- a/gst-libs/gst/play/play.old.c
+++ b/gst-libs/gst/play/play.old.c
@@ -57,7 +57,7 @@ struct _GstPlaySignal
GstElementState new_state;
} state;
struct {
- GstElement* element;
+ GstObject* object;
GParamSpec* param;
} info;
struct {
@@ -343,8 +343,8 @@ gst_play_idle_signal (GstPlay *play)
break;
case INFORMATION:
g_signal_emit (G_OBJECT (play), gst_play_signals[INFORMATION], 0,
- signal->signal_data.info.element, signal->signal_data.info.param);
- gst_object_unref (GST_OBJECT(signal->signal_data.info.element));
+ signal->signal_data.info.object, signal->signal_data.info.param);
+ gst_object_unref (signal->signal_data.info.object);
break;
case PIPELINE_ERROR:
if (gst_element_get_state(play->pipeline) == GST_STATE_PLAYING)
@@ -462,8 +462,8 @@ callback_pipeline_error ( GstElement *object,
}
static void
-callback_pipeline_deep_notify ( GstElement *element,
- GstElement *orig,
+callback_pipeline_deep_notify ( GstObject *element,
+ GstObject *orig,
GParamSpec *param,
GstPlay* play)
{
@@ -471,10 +471,10 @@ callback_pipeline_deep_notify ( GstElement *element,
signal = g_new0(GstPlaySignal, 1);
signal->signal_id = INFORMATION;
- signal->signal_data.info.element = orig;
+ signal->signal_data.info.object = orig;
signal->signal_data.info.param = param;
- gst_object_ref (GST_OBJECT(orig));
+ gst_object_ref (orig);
g_async_queue_push(play->signal_queue, signal);
diff --git a/gst-libs/gst/play/play.old.h b/gst-libs/gst/play/play.old.h
index 6851b11e..0ab8f389 100644
--- a/gst-libs/gst/play/play.old.h
+++ b/gst-libs/gst/play/play.old.h
@@ -140,7 +140,7 @@ struct _GstPlayClass
/* signals */
void (*information) ( GstPlay* play,
- GstElement* element,
+ GstObject* element,
GParamSpec *param);
void (*pipeline_error) ( GstPlay* play,
GstElement* element,