-Subproject commit 86c508421de359776c4c2cb411a78c729330a250
+Subproject commit 2a013c06fe9bf1379966cd12e6bf8c30915c5f12
AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
fi
+# do not use deprecated stuff
+GST_CFLAGS="$GST_CFLAGS -DGST_DISABLE_DEPRECATED"
+
if test "x$USE_DEBUG" = xyes; then
GST_CFLAGS="$GST_CFLAGS -g"
fi
gst_element_add_pad (fd->input, src_pad);
gst_element_add_pad (fd->output, sink_pad);
- gst_element_connect_many (fd->input, fd->filter, fd->output, NULL);
+ gst_element_link_many (fd->input, fd->filter, fd->output, NULL);
if (fd->pipe_string) g_free (fd->pipe_string);
fd->pipe_string = g_strdup_printf ("%s ! %s ! %s", fd->input_pipe,
}
if (res) {
- /* for the first track (i==0) we wait until we have the
+ /* for the first track (i==0) we wait until we have the
* time of the next track */
if (i > 0) {
gint64 length = time - time_count;
- g_print ("track %d: %lld:%02lld -> %lld:%02lld, length: %lld:%02lld\n", i-1,
- time_count/60, time_count%60,
- time/60, time%60,
- length/60, length%60);
+ g_print ("track %d: %lld:%02lld -> %lld:%02lld, length: %lld:%02lld\n",
+ i-1,
+ time_count / 60, time_count % 60,
+ time / 60, time % 60,
+ length / 60, length % 60);
}
}
else {
GstEvent *event;
gint count;
gboolean res;
-
+
gst_init (&argc, &argv);
pipeline = gst_pipeline_new ("pipeline");
gst_bin_add (GST_BIN (pipeline), cdparanoia);
gst_bin_add (GST_BIN (pipeline), osssink);
- gst_element_connect_pads (cdparanoia, "src", osssink, "sink");
+ gst_element_link_pads (cdparanoia, "src", osssink, "sink");
- g_signal_connect (G_OBJECT (pipeline), "deep_notify",
+ g_signal_connect (G_OBJECT (pipeline), "deep_notify",
G_CALLBACK (gst_element_default_deep_notify), NULL);
-
+
gst_element_set_state (pipeline, GST_STATE_PAUSED);
/* now we go into probe mode */
/* seek to track3 */
event = gst_event_new_seek (track_format |
GST_SEEK_METHOD_SET |
- GST_SEEK_FLAG_FLUSH,
+ GST_SEEK_FLAG_FLUSH,
3);
res = gst_pad_send_event (pad, event);
/* seek to some seconds */
event = gst_event_new_segment_seek (GST_FORMAT_TIME |
GST_SEEK_METHOD_SET |
- GST_SEEK_FLAG_FLUSH,
+ GST_SEEK_FLAG_FLUSH,
25 * GST_SECOND, 29 * GST_SECOND);
res = gst_pad_send_event (pad, event);
if (!res)
const gchar *padname;
GstPad *target;
GstElement *bin;
-} dyn_connect;
+} dyn_link;
static void
-dynamic_connect (GstPadTemplate *templ, GstPad *newpad, gpointer data)
+dynamic_link (GstPadTemplate *templ, GstPad *newpad, gpointer data)
{
- dyn_connect *connect = (dyn_connect *) data;
+ dyn_link *connect = (dyn_link *) data;
if (!strcmp (gst_pad_get_name (newpad), connect->padname)) {
gst_element_set_state (pipeline, GST_STATE_PAUSED);
gst_bin_add (GST_BIN (pipeline), connect->bin);
- gst_pad_connect (newpad, connect->target);
+ gst_pad_link (newpad, connect->target);
gst_element_set_state (pipeline, GST_STATE_PLAYING);
seekable_pads = g_list_prepend (seekable_pads, newpad);
}
static void
-setup_dynamic_connection (GstElement *element, const gchar *padname, GstPad *target, GstElement *bin)
+setup_dynamic_linkion (GstElement *element, const gchar *padname, GstPad *target, GstElement *bin)
{
- dyn_connect *connect;
+ dyn_link *connect;
- connect = g_new0 (dyn_connect, 1);
+ connect = g_new0 (dyn_link, 1);
connect->padname = g_strdup (padname);
connect->target = target;
connect->bin = bin;
- g_signal_connect (G_OBJECT (element), "new_pad", G_CALLBACK (dynamic_connect), connect);
+ g_signal_connect (G_OBJECT (element), "new_pad", G_CALLBACK (dynamic_link), connect);
}
static GstElement*
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), audiosink);
gst_bin_add (GST_BIN (pipeline), videosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
- gst_element_connect (decoder, videosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
+ gst_element_link (decoder, videosink);
seekable = gst_element_get_pad (decoder, "video");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), parser);
gst_bin_add (GST_BIN (pipeline), fakesink);
- gst_element_connect (src, parser);
- gst_element_connect (parser, fakesink);
+ gst_element_link (src, parser);
+ gst_element_link (parser, fakesink);
seekable = gst_element_get_pad (parser, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (audio_thread), osssink);
gst_bin_add (GST_BIN (pipeline), audio_thread);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, queue);
- gst_element_connect (queue, osssink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, queue);
+ gst_element_link (queue, osssink);
seekable = gst_element_get_pad (queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), src);
gst_bin_add (GST_BIN (pipeline), demux);
- gst_element_connect (src, demux);
+ gst_element_link (src, demux);
audio_bin = gst_bin_new ("a_decoder_bin");
a_decoder = gst_element_factory_make_or_warn ("mad", "a_dec");
audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink");
//g_object_set (G_OBJECT (audiosink), "fragment", 0x00180008, NULL);
a_queue = gst_element_factory_make_or_warn ("queue", "a_queue");
- gst_element_connect (a_decoder, a_queue);
- gst_element_connect (a_queue, audiosink);
+ gst_element_link (a_decoder, a_queue);
+ gst_element_link (a_queue, audiosink);
gst_bin_add (GST_BIN (audio_bin), a_decoder);
gst_bin_add (GST_BIN (audio_bin), audio_thread);
gst_bin_add (GST_BIN (audio_thread), a_queue);
gst_bin_add (GST_BIN (audio_thread), audiosink);
gst_element_set_state (audio_bin, GST_STATE_PAUSED);
- setup_dynamic_connection (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
+ setup_dynamic_linkion (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
seekable = gst_element_get_pad (a_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
//g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
v_queue = gst_element_factory_make_or_warn ("queue", "v_queue");
//g_object_set (G_OBJECT (v_queue), "max_level", 10, NULL);
- gst_element_connect (v_decoder, v_queue);
- gst_element_connect (v_queue, videosink);
+ gst_element_link (v_decoder, v_queue);
+ gst_element_link (v_queue, videosink);
gst_bin_add (GST_BIN (video_bin), v_decoder);
gst_bin_add (GST_BIN (video_bin), video_thread);
gst_bin_add (GST_BIN (video_thread), v_queue);
gst_element_set_state (video_bin, GST_STATE_PAUSED);
- setup_dynamic_connection (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
+ setup_dynamic_linkion (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
seekable = gst_element_get_pad (v_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), src);
gst_bin_add (GST_BIN (pipeline), demux);
- gst_element_connect (src, demux);
+ gst_element_link (src, demux);
audio_bin = gst_bin_new ("a_decoder_bin");
a_decoder = gst_element_factory_make_or_warn ("mad", "a_dec");
a_queue = gst_element_factory_make_or_warn ("queue", "a_queue");
audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink");
g_object_set (G_OBJECT (audiosink), "fragment", 0x00180008, NULL);
- gst_element_connect (a_decoder, a_queue);
- gst_element_connect (a_queue, audiosink);
+ gst_element_link (a_decoder, a_queue);
+ gst_element_link (a_queue, audiosink);
gst_bin_add (GST_BIN (audio_bin), a_decoder);
gst_bin_add (GST_BIN (audio_bin), audio_thread);
gst_bin_add (GST_BIN (audio_thread), a_queue);
gst_bin_add (GST_BIN (audio_thread), audiosink);
- setup_dynamic_connection (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
+ setup_dynamic_linkion (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
seekable = gst_element_get_pad (a_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
v_queue = gst_element_factory_make_or_warn ("queue", "v_queue");
v_filter = gst_element_factory_make_or_warn ("colorspace", "v_filter");
videosink = gst_element_factory_make_or_warn ("xvideosink", "v_sink");
- gst_element_connect_many (v_decoder, v_queue, v_filter, NULL);
+ gst_element_link_many (v_decoder, v_queue, v_filter, NULL);
- gst_element_connect_pads (v_filter, "src", videosink, "sink");
+ gst_element_link (v_filter, videosink);
gst_bin_add_many (GST_BIN (video_bin), v_decoder, video_thread, NULL);
gst_bin_add_many (GST_BIN (video_thread), v_queue, v_filter, videosink, NULL);
- setup_dynamic_connection (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
+ setup_dynamic_linkion (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
seekable = gst_element_get_pad (v_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), src);
gst_bin_add (GST_BIN (pipeline), demux);
- gst_element_connect (src, demux);
+ gst_element_link (src, demux);
audio_bin = gst_bin_new ("a_decoder_bin");
a_decoder = gst_element_factory_make_or_warn ("mad", "a_dec");
audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink");
//g_object_set (G_OBJECT (audiosink), "fragment", 0x00180008, NULL);
g_object_set (G_OBJECT (audiosink), "sync", FALSE, NULL);
- gst_element_connect (a_decoder, a_queue);
- gst_element_connect (a_queue, audiosink);
+ gst_element_link (a_decoder, a_queue);
+ gst_element_link (a_queue, audiosink);
gst_bin_add (GST_BIN (audio_bin), a_decoder);
gst_bin_add (GST_BIN (audio_bin), audio_thread);
gst_bin_add (GST_BIN (audio_thread), a_queue);
gst_bin_add (GST_BIN (audio_thread), audiosink);
- setup_dynamic_connection (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
+ setup_dynamic_linkion (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
seekable = gst_element_get_pad (a_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
v_decoder = gst_element_factory_make_or_warn ("mpeg2dec", "v_dec");
v_filter = gst_element_factory_make_or_warn ("colorspace", "v_filter");
videosink = gst_element_factory_make_or_warn ("xvideosink", "v_sink");
- gst_element_connect_many (v_decoder, v_filter, NULL);
+ gst_element_link_many (v_decoder, v_filter, videosink, NULL);
- gst_element_connect_pads (v_filter, "src", videosink, "sink");
gst_bin_add_many (GST_BIN (video_bin), v_decoder, v_filter, videosink, NULL);
- setup_dynamic_connection (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
+ setup_dynamic_linkion (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
seekable = gst_element_get_pad (v_decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), a_thread);
gst_bin_add (GST_BIN (pipeline), v_thread);
- gst_element_connect (src, decoder);
- gst_element_connect (v_queue, videosink);
- gst_element_connect (decoder, v_queue);
- gst_element_connect (a_queue, audiosink);
- gst_element_connect (decoder, a_queue);
+ gst_element_link (src, decoder);
+ gst_element_link (v_queue, videosink);
+ gst_element_link (decoder, v_queue);
+ gst_element_link (a_queue, audiosink);
+ gst_element_link (decoder, a_queue);
seekable_elements = g_list_prepend (seekable_elements, videosink);
seekable_elements = g_list_prepend (seekable_elements, audiosink);
default:
break;
}
-
walk = g_list_next (walk);
}
}
else {
g_print (" unkown caps type\n");
}
-
}
static void
print_lbs_info (struct probe_context *context, gint stream)
{
const GstFormat *formats;
-
+
/* FIXME: need a better name here */
g_print (" stream info:\n");
definition = gst_format_get_details (format);
/* get start and end position of this stream */
- res = gst_pad_convert (context->pad,
+ res = gst_pad_convert (context->pad,
context->ls_format, stream,
&format, &value_start);
- res &= gst_pad_convert (context->pad,
+ res &= gst_pad_convert (context->pad,
context->ls_format, stream + 1,
&format, &value_end);
if (format == GST_FORMAT_TIME) {
value_end /= (GST_SECOND/100);
- g_print (" %s: %lld:%02lld.%02lld\n", definition->nick,
+ g_print (" %s: %lld:%02lld.%02lld\n", definition->nick,
value_end/6000, (value_end/100)%60, (value_end%100));
}
else {
GValue value = { 0, };
if (!strcmp (pspec->name, "metadata")) {
-
+
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (origin), pspec->name, &value);
context->metadata = g_value_peek_pointer (&value);
}
else if (!strcmp (pspec->name, "streaminfo")) {
-
+
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (origin), pspec->name, &value);
context->streaminfo = g_value_peek_pointer (&value);
GstEvent *event;
gboolean res;
gint count;
-
+
g_print ("info for logical stream %d:\n", stream);
/* seek to stream */
count++;
if (count > 10) break;
}
-
+
print_caps (context->metadata);
print_caps (context->streaminfo);
print_format (context->caps);
print_lbs_info (context, stream);
g_print ("\n");
-
+
return TRUE;
}
gint64 value;
gboolean res;
GstFormat format;
-
+
format = *formats;
formats++;
- res = gst_pad_query (context->pad, GST_QUERY_TOTAL,
+ res = gst_pad_query (context->pad, GST_QUERY_TOTAL,
&format, &value);
definition = gst_format_get_details (format);
if (res) {
if (format == GST_FORMAT_TIME) {
value /= (GST_SECOND/100);
- g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick,
+ g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick,
value/6000, (value/100)%60, (value%100));
}
else {
GstFormat logical_stream_format;
struct probe_context *context;
gint stream;
-
+
gst_init (&argc, &argv);
if (argc < 2) {
gst_bin_add (GST_BIN (pipeline), filesrc);
gst_bin_add (GST_BIN (pipeline), vorbisfile);
- gst_element_connect_pads (filesrc, "src", vorbisfile, "sink");
+ gst_element_link_pads (filesrc, "src", vorbisfile, "sink");
pad = gst_element_get_pad (vorbisfile, "src");
g_assert (pad);
context->pad = pad;
context->ls_format = logical_stream_format;
- g_signal_connect (G_OBJECT (pipeline), "deep_notify",
+ g_signal_connect (G_OBJECT (pipeline), "deep_notify",
G_CALLBACK (deep_notify), context);
-
+
gst_element_set_state (pipeline, GST_STATE_PLAYING);
/* at this point we can inspect the stream */
collect_logical_stream_properties (context, stream);
stream++;
}
-
+
/* stop probe */
gst_element_set_state (pipeline, GST_STATE_NULL);
gst_element_add_pad(GST_ELEMENT(this), GST_ALSA_PAD(this->pads)->pad);
- gst_pad_set_connect_function(GST_ALSA_PAD(this->pads)->pad, gst_alsa_connect);
+ gst_pad_set_link_function(GST_ALSA_PAD(this->pads)->pad, gst_alsa_connect);
gst_element_set_loop_function(GST_ELEMENT(this), gst_alsa_loop);
}
pad->channel = channel;
pad->pad = gst_pad_new_from_template (templ, newname);
gst_element_add_pad (GST_ELEMENT (this), pad->pad);
- gst_pad_set_connect_function(pad->pad, gst_alsa_connect);
+ gst_pad_set_link_function(pad->pad, gst_alsa_connect);
if (this->data_interleaved && this->pads) {
gst_element_remove_pad (GST_ELEMENT (this), GST_ALSA_PAD(this->pads)->pad);
GstAlsa *this;
gboolean need_mmap;
- g_return_val_if_fail (caps != NULL, GST_PAD_CONNECT_REFUSED);
- g_return_val_if_fail (pad != NULL, GST_PAD_CONNECT_REFUSED);
+ g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED);
+ g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED);
this = GST_ALSA(gst_pad_get_parent(pad));
if (GST_CAPS_IS_FIXED (caps)) {
if (this->handle == NULL)
if (!gst_alsa_open_audio(this))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
if (gst_alsa_parse_caps(this, caps)) {
need_mmap = this->mmap_open;
/* FIXME send out another caps if nego fails */
if (!gst_alsa_open_audio(this))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
if (!gst_alsa_start_audio(this))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
if (need_mmap && !gst_alsa_get_channel_addresses(this))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
/* shamelessly stolen from pbd's audioengine and jack alsa_driver. thanks, paul! */
vorbisenc = GST_VORBISENC (gst_pad_get_parent (pad));
if (!GST_CAPS_IS_FIXED (caps))
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
gst_caps_get_int (caps, "channels", &vorbisenc->channels);
gst_caps_get_int (caps, "rate", &vorbisenc->frequency);
gst_vorbisenc_setup (vorbisenc);
if (vorbisenc->setup)
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
static gboolean
vorbisenc->sinkpad = gst_pad_new_from_template (gst_vorbisenc_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (vorbisenc), vorbisenc->sinkpad);
gst_pad_set_chain_function (vorbisenc->sinkpad, gst_vorbisenc_chain);
- gst_pad_set_connect_function (vorbisenc->sinkpad, gst_vorbisenc_sinkconnect);
+ gst_pad_set_link_function (vorbisenc->sinkpad, gst_vorbisenc_sinkconnect);
gst_pad_set_convert_function (vorbisenc->sinkpad, GST_DEBUG_FUNCPTR (gst_vorbisenc_convert_sink));
gst_pad_set_formats_function (vorbisenc->sinkpad, GST_DEBUG_FUNCPTR (gst_vorbisenc_get_formats));
gst_bin_add (GST_BIN (priv->pipeline), priv->typefind);
g_object_set (G_OBJECT (priv->source), "location", location, NULL);
- if (!gst_element_connect (priv->source, priv->typefind))
- g_warning ("Couldn't connect source and typefind\n");
+ if (!gst_element_link (priv->source, priv->typefind))
+ g_warning ("Couldn't link source and typefind\n");
g_signal_connect (G_OBJECT (priv->typefind), "have-type",
G_CALLBACK (have_type_callback), info);
if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
/*clear up typefind */
gst_element_set_state (priv->pipeline, GST_STATE_READY);
- gst_element_disconnect (priv->source, priv->typefind);
+ gst_element_unlink (priv->source, priv->typefind);
gst_bin_remove (GST_BIN (priv->pipeline), priv->typefind);
}
/* get properties of complete physical stream
/* clear up decoder */
/* FIXME: shouldn't need to set state here */
gst_element_set_state (info->priv->pipeline, GST_STATE_READY);
- gst_element_disconnect (info->priv->source, info->priv->decoder);
+ gst_element_unlink (info->priv->source, info->priv->decoder);
gst_bin_remove (GST_BIN (info->priv->pipeline), info->priv->decoder);
info->priv->decoder = NULL;
}
/* set up pipeline and connect signal handlers */
priv->decoder = decoder;
gst_bin_add (GST_BIN (priv->pipeline), decoder);
- if (!gst_element_connect (priv->source, decoder))
- g_warning ("Couldn't connect source and decoder\n");
- /* FIXME: we should be connecting to ALL possible src pads */
+ if (!gst_element_link (priv->source, decoder))
+ g_warning ("Couldn't link source and decoder\n");
+ /* FIXME: we should be link to ALL possible src pads */
if (!(priv->decoder_pad = gst_element_get_pad (decoder, "src")))
g_warning ("Couldn't get decoder pad\n");
if (!(priv->source_pad = gst_element_get_pad (priv->source, "src")))
GST_BIN (play->pipeline), play->volume,
play->audio_sink, NULL);
- gst_element_connect (play->volume, play->audio_sink);
+ gst_element_link (play->volume, play->audio_sink);
gst_bin_set_pre_iterate_function(
GST_BIN (play->pipeline),
GST_BIN (play->pipeline), play->volume,
play->audio_sink, NULL);
- gst_element_connect (play->volume, play->audio_sink);
+ gst_element_link (play->volume, play->audio_sink);
gst_bin_set_pre_iterate_function(
GST_BIN (play->pipeline),
if (play->audio_sink)
{
- gst_element_disconnect (play->volume, play->audio_sink);
+ gst_element_unlink (play->volume, play->audio_sink);
gst_bin_remove (GST_BIN (play->pipeline), play->audio_sink);
}
play->audio_sink = audio_sink;
gst_bin_add (GST_BIN (play->pipeline), play->audio_sink);
- gst_element_connect (play->volume, play->audio_sink);
+ gst_element_link (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
if (play->autoplugger) {
/* we need to remove the existing autoplugger before creating a new one */
- gst_element_disconnect (play->autoplugger, play->volume);
- gst_element_disconnect (play->autoplugger, play->source);
+ gst_element_unlink (play->autoplugger, play->volume);
+ gst_element_unlink (play->autoplugger, play->source);
gst_bin_remove (GST_BIN (play->pipeline), play->autoplugger);
}
g_return_val_if_fail (play->autoplugger != NULL, FALSE);
gst_bin_add (GST_BIN (play->pipeline), play->autoplugger);
- gst_element_connect (play->source, play->autoplugger);
- gst_element_connect (play->autoplugger, play->volume);
+ gst_element_link (play->source, play->autoplugger);
+ gst_element_link (play->autoplugger, play->volume);
return TRUE;
}
GST_BIN (audio_thread), audio_queue, play->volume,
play->audio_sink, NULL);
- gst_element_connect_many (audio_queue, play->volume, play->audio_sink);
+ gst_element_link_many (audio_queue, play->volume, play->audio_sink);
gst_element_add_ghost_pad (
audio_thread, gst_element_get_pad (audio_queue, "sink"),
if (play->audio_sink)
{
- gst_element_disconnect (play->volume, play->audio_sink);
+ gst_element_unlink (play->volume, play->audio_sink);
gst_bin_remove (GST_BIN (audio_thread), play->audio_sink);
}
play->audio_sink = audio_sink;
gst_bin_add (GST_BIN (audio_thread), play->audio_sink);
- gst_element_connect (play->volume, play->audio_sink);
+ gst_element_link (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
if (play->autoplugger) {
/* we need to remove the existing autoplugger before creating a new one */
- gst_element_disconnect (play->autoplugger, audio_thread);
- gst_element_disconnect (play->autoplugger, play->source);
+ gst_element_unlink (play->autoplugger, audio_thread);
+ gst_element_unlink (play->autoplugger, play->source);
gst_bin_remove (GST_BIN (play->pipeline), play->autoplugger);
}
g_return_val_if_fail (play->autoplugger != NULL, FALSE);
gst_bin_add (GST_BIN (play->pipeline), play->autoplugger);
- gst_element_connect (play->source, play->autoplugger);
- gst_element_connect (play->autoplugger, audio_thread);
+ gst_element_link (play->source, play->autoplugger);
+ gst_element_link (play->autoplugger, audio_thread);
return TRUE;
}
gst_bin_add_many (
GST_BIN (audio_bin), audio_queue, play->volume,
play->audio_sink, NULL);
- gst_element_connect_many (audio_queue, play->volume,
+ gst_element_link_many (audio_queue, play->volume,
play->audio_sink, NULL);
gst_element_add_ghost_pad (
gst_bin_add_many (GST_BIN (video_bin), video_queue, colorspace,
play->video_sink, NULL);
- gst_element_connect_many (video_queue, colorspace,
+ gst_element_link_many (video_queue, colorspace,
play->video_sink, NULL);
/* setting up iterate functions */
if (play->autoplugger) {
/* we need to remove the existing autoplugger before creating a new one */
- gst_element_disconnect (play->autoplugger, audio_bin);
- gst_element_disconnect (play->autoplugger, play->source);
- gst_element_disconnect (play->autoplugger, video_bin);
+ gst_element_unlink (play->autoplugger, audio_bin);
+ gst_element_unlink (play->autoplugger, play->source);
+ gst_element_unlink (play->autoplugger, video_bin);
gst_bin_remove (GST_BIN (work_thread), play->autoplugger);
}
g_return_val_if_fail (play->autoplugger != NULL, FALSE);
gst_bin_add (GST_BIN (work_thread), play->autoplugger);
- gst_element_connect (play->source, play->autoplugger);
- gst_element_connect (play->autoplugger, audio_bin);
- gst_element_connect (play->autoplugger, video_bin);
+ gst_element_link (play->source, play->autoplugger);
+ gst_element_link (play->autoplugger, audio_bin);
+ gst_element_link (play->autoplugger, video_bin);
return TRUE;
}
video_mate = g_hash_table_lookup(play->other_elements, "colorspace");
if (play->video_sink) {
- gst_element_disconnect (video_mate, play->video_sink);
+ gst_element_unlink (video_mate, play->video_sink);
gst_bin_remove (GST_BIN (video_bin), play->video_sink);
}
play->video_sink = video_sink;
gst_bin_add (GST_BIN (video_bin), play->video_sink);
- gst_element_connect (video_mate, play->video_sink);
+ gst_element_link (video_mate, play->video_sink);
play->video_sink_element = gst_play_get_sink_element (play, video_sink);
if (play->audio_sink)
{
- gst_element_disconnect (play->volume, play->audio_sink);
+ gst_element_unlink (play->volume, play->audio_sink);
gst_bin_remove (GST_BIN (audio_bin), play->audio_sink);
}
play->audio_sink = audio_sink;
gst_bin_add (GST_BIN (audio_bin), play->audio_sink);
- gst_element_connect (play->volume, play->audio_sink);
+ gst_element_link (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
GST_BIN (audio_bin), audio_queue,
play->volume, play->audio_sink, NULL);
- gst_element_connect_many (
+ gst_element_link_many (
audio_queue, play->volume,
play->audio_sink, NULL);
GST_BIN (play->pipeline), video_queue,
play->video_sink, NULL);
- gst_element_connect (video_queue, play->video_sink);
+ gst_element_link (video_queue, play->video_sink);
gst_bin_set_pre_iterate_function(
GST_BIN (play->pipeline),
(GstBinPrePostIterateFunction) callback_bin_post_iterate,
play->video_bin_mutex);
- gst_element_connect (work_thread, video_queue);
+ gst_element_link (work_thread, video_queue);
return TRUE;
}
if (play->autoplugger) {
/* we need to remove the existing autoplugger
* before creating a new one */
- gst_element_disconnect (play->autoplugger, audio_bin);
- gst_element_disconnect (play->autoplugger, play->source);
- gst_element_disconnect (play->autoplugger, auto_identity);
+ gst_element_unlink (play->autoplugger, audio_bin);
+ gst_element_unlink (play->autoplugger, play->source);
+ gst_element_unlink (play->autoplugger, auto_identity);
gst_bin_remove (GST_BIN (work_thread), play->autoplugger);
}
g_return_val_if_fail (play->autoplugger != NULL, FALSE);
gst_bin_add (GST_BIN (work_thread), play->autoplugger);
- gst_element_connect (play->source, play->autoplugger);
- gst_element_connect (play->autoplugger, audio_bin);
- gst_element_connect (play->autoplugger, auto_identity);
+ gst_element_link (play->source, play->autoplugger);
+ gst_element_link (play->autoplugger, audio_bin);
+ gst_element_link (play->autoplugger, auto_identity);
return TRUE;
}
video_mate = g_hash_table_lookup (play->other_elements, "video_queue");
if (play->video_sink) {
- gst_element_disconnect (video_mate, play->video_sink);
+ gst_element_unlink (video_mate, play->video_sink);
gst_bin_remove (GST_BIN (play->pipeline), play->video_sink);
}
play->video_sink = video_sink;
gst_bin_add (GST_BIN (play->pipeline), play->video_sink);
- gst_element_connect (video_mate, play->video_sink);
+ gst_element_link (video_mate, play->video_sink);
return TRUE;
}
if (play->audio_sink)
{
- gst_element_disconnect (play->volume, play->audio_sink);
+ gst_element_unlink (play->volume, play->audio_sink);
gst_bin_remove (GST_BIN (audio_bin), play->audio_sink);
}
play->audio_sink = audio_sink;
gst_bin_add (GST_BIN (audio_bin), play->audio_sink);
- gst_element_connect (play->volume, play->audio_sink);
+ gst_element_link (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
GSList *channels;
GstPad *p;
- g_return_val_if_fail (caps != NULL, GST_PAD_CONNECT_REFUSED);
- g_return_val_if_fail (pad != NULL, GST_PAD_CONNECT_REFUSED);
+ g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED);
+ g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED);
adder = GST_ADDER (GST_PAD_PARENT (pad));
if (GST_CAPS_IS_FIXED (caps)) {
if (!gst_adder_parse_caps (adder, caps))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
if (pad == adder->srcpad || gst_pad_try_set_caps (adder->srcpad, caps) > 0) {
sinkpads = gst_element_get_pad_list ((GstElement *) adder);
if (p != pad && p != adder->srcpad) {
if (gst_pad_try_set_caps (p, caps) <= 0) {
GST_DEBUG (GST_CAT_PLUGIN_INFO,
- "caps mismatch; disconnecting and removing pad %s:%s "
+ "caps mismatch; unlinking and removing pad %s:%s "
"(peer %s:%s)",
GST_DEBUG_PAD_NAME (p),
GST_DEBUG_PAD_NAME (GST_PAD_PEER (p)));
- gst_pad_disconnect (GST_PAD (GST_PAD_PEER (p)), p);
+ gst_pad_unlink (GST_PAD (GST_PAD_PEER (p)), p);
remove = g_list_prepend (remove, p);
}
}
}
remove = g_list_next (remove);
}
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
} else {
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
} else {
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
}
"src");
gst_element_add_pad (GST_ELEMENT (adder), adder->srcpad);
gst_element_set_loop_function (GST_ELEMENT (adder), gst_adder_loop);
- gst_pad_set_connect_function (adder->srcpad, gst_adder_connect);
+ gst_pad_set_link_function (adder->srcpad, gst_adder_connect);
adder->format = GST_ADDER_FORMAT_UNSET;
input->bytestream = gst_bytestream_new (input->sinkpad);
gst_element_add_pad (GST_ELEMENT (adder), input->sinkpad);
- gst_pad_set_connect_function(input->sinkpad, gst_adder_connect);
+ gst_pad_set_link_function(input->sinkpad, gst_adder_connect);
/* add the input_channel to the list of input channels */
if (GST_CAPS_IS_FIXED (caps))
return gst_pad_try_set_caps (audioscale->srcpad, newcaps);
else
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
static void *
audioscale->sinkpad = gst_pad_new_from_template (GST_PAD_TEMPLATE_GET (sink_template), "sink");
gst_element_add_pad(GST_ELEMENT(audioscale),audioscale->sinkpad);
gst_pad_set_chain_function(audioscale->sinkpad,gst_audioscale_chain);
- gst_pad_set_connect_function (audioscale->sinkpad, gst_audioscale_sinkconnect);
+ gst_pad_set_link_function (audioscale->sinkpad, gst_audioscale_sinkconnect);
audioscale->srcpad = gst_pad_new_from_template (GST_PAD_TEMPLATE_GET (src_template), "src");
osssink = gst_element_factory_make("osssink","sound-sink");
volfilter = gst_element_factory_make("volume","volume-filter");
gst_bin_add_many(GST_BIN(thread), sinesrc, volfilter, osssink, NULL);
- gst_element_connect_many(sinesrc, volfilter, osssink, NULL);
+ gst_element_link_many(sinesrc, volfilter, osssink, NULL);
/* this breaks with current alsa oss compat lib */
g_object_set(G_OBJECT(osssink),"fragment",0x00180008,NULL);
g_object_set(G_OBJECT(osssink),"sync",FALSE,NULL);
videoscale = GST_VIDEOSCALE (gst_pad_get_parent (pad));
if (!GST_CAPS_IS_FIXED (caps)) {
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
gst_caps_get_fourcc_int (caps, "format", &videoscale->format);
/*gst_pad_set_negotiate_function(videoscale->sinkpad,videoscale_negotiate_sink); */
gst_element_add_pad(GST_ELEMENT(videoscale),videoscale->sinkpad);
gst_pad_set_chain_function(videoscale->sinkpad,gst_videoscale_chain);
- gst_pad_set_connect_function(videoscale->sinkpad,gst_videoscale_sinkconnect);
+ gst_pad_set_link_function(videoscale->sinkpad,gst_videoscale_sinkconnect);
videoscale->srcpad = gst_pad_new_from_template (
GST_PAD_TEMPLATE_GET (src_templ), "src");
#if 0
if (!GST_CAPS_IS_FIXED (caps)) {
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
#endif
videotestsrc->format, videotestsrc->forced_format);
if (videotestsrc->forced_format && videotestsrc->format != videotestsrc->forced_format) {
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
printf ("videotestsrc: using FOURCC 0x%08x\n", videotestsrc->format);
GST_DEBUG (0, "size %d x %d", videotestsrc->width, videotestsrc->height);
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
static GstElementStateReturn
gst_pad_set_getcaps_function (videotestsrc->srcpad, gst_videotestsrc_getcaps);
gst_element_add_pad (GST_ELEMENT (videotestsrc), videotestsrc->srcpad);
gst_pad_set_get_function (videotestsrc->srcpad, gst_videotestsrc_get);
- gst_pad_set_connect_function (videotestsrc->srcpad, gst_videotestsrc_srcconnect);
+ gst_pad_set_link_function (videotestsrc->srcpad, gst_videotestsrc_srcconnect);
videotestsrc->width = 640;
videotestsrc->height = 480;
gint rate;
filter = GST_VOLUME (gst_pad_get_parent (pad));
- g_return_val_if_fail (filter != NULL, GST_PAD_CONNECT_REFUSED);
- g_return_val_if_fail (GST_IS_VOLUME (filter), GST_PAD_CONNECT_REFUSED);
+ g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED);
+ g_return_val_if_fail (GST_IS_VOLUME (filter), GST_PAD_LINK_REFUSED);
otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad);
if (GST_CAPS_IS_FIXED (caps)) {
GstPadConnectReturn set_retval;
if (!volume_parse_caps (filter, caps))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
if ((set_retval = gst_pad_try_set_caps(otherpad, caps)) > 0)
if (gst_caps_get_int (caps, "rate", &rate)){
return set_retval;
}
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
static gboolean
volume_init (GstVolume *filter)
{
filter->sinkpad = gst_pad_new_from_template(volume_sink_factory (),"sink");
- gst_pad_set_connect_function(filter->sinkpad,volume_connect);
+ gst_pad_set_link_function(filter->sinkpad,volume_connect);
gst_pad_set_bufferpool_function(filter->sinkpad,volume_get_bufferpool);
filter->srcpad = gst_pad_new_from_template(volume_src_factory (),"src");
- gst_pad_set_connect_function(filter->srcpad,volume_connect);
+ gst_pad_set_link_function(filter->srcpad,volume_connect);
gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad);
gst_element_add_pad(GST_ELEMENT(filter),filter->srcpad);
gst_element_add_pad (GST_ELEMENT (v4lmjpegsink), v4lmjpegsink->sinkpad);
gst_pad_set_chain_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_chain);
- gst_pad_set_connect_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_sinkconnect);
+ gst_pad_set_link_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_sinkconnect);
v4lmjpegsink->clock = NULL;
/* we are not going to act on variable caps */
if (!GST_CAPS_IS_FIXED (vscapslist) || !GST_V4L_IS_OPEN(GST_V4LELEMENT(v4lmjpegsink)))
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
/* in case the buffers are active (which means that we already
* did capsnego before and didn't clean up), clean up anyways */
if (GST_V4L_IS_ACTIVE(GST_V4LELEMENT(v4lmjpegsink)))
if (!gst_v4lmjpegsink_playback_deinit(v4lmjpegsink))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
for (caps = vscapslist; caps != NULL; caps = vscapslist = vscapslist->next)
{
g_signal_emit (G_OBJECT (v4lmjpegsink), gst_v4lmjpegsink_signals[SIGNAL_HAVE_SIZE], 0,
v4lmjpegsink->width, v4lmjpegsink->height);
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
/* if we got here - it's not good */
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
gst_element_add_pad(GST_ELEMENT(v4lmjpegsrc), v4lmjpegsrc->srcpad);
gst_pad_set_get_function (v4lmjpegsrc->srcpad, gst_v4lmjpegsrc_get);
- gst_pad_set_connect_function (v4lmjpegsrc->srcpad, gst_v4lmjpegsrc_srcconnect);
+ gst_pad_set_link_function (v4lmjpegsrc->srcpad, gst_v4lmjpegsrc_srcconnect);
gst_pad_set_convert_function (v4lmjpegsrc->srcpad, gst_v4lmjpegsrc_srcconvert);
v4lmjpegsrc->bufferpool = gst_buffer_pool_new(
if (GST_V4L_IS_ACTIVE(GST_V4LELEMENT(v4lmjpegsrc)))
{
if (!gst_v4lmjpegsrc_capture_deinit(v4lmjpegsrc))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
else if (!GST_V4L_IS_OPEN(GST_V4LELEMENT(v4lmjpegsrc)))
{
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
/* Note: basically, we don't give a damn about the opposite caps here.
/* set buffer info */
if (!gst_v4lmjpegsrc_set_buffer(v4lmjpegsrc, v4lmjpegsrc->numbufs, v4lmjpegsrc->bufsize))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
/* set capture parameters and mmap the buffers */
if (!v4lmjpegsrc->frame_width && !v4lmjpegsrc->frame_height &&
{
if (!gst_v4lmjpegsrc_set_capture(v4lmjpegsrc,
v4lmjpegsrc->horizontal_decimation, v4lmjpegsrc->quality))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
else
{
v4lmjpegsrc->frame_width, v4lmjpegsrc->frame_height,
v4lmjpegsrc->horizontal_decimation, v4lmjpegsrc->vertical_decimation,
v4lmjpegsrc->quality))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
/* we now have an actual width/height - *set it* */
caps = gst_caps_new("v4lmjpegsrc_caps",
"width", GST_PROPS_INT(v4lmjpegsrc->end_width),
"height", GST_PROPS_INT(v4lmjpegsrc->end_height),
NULL ) );
- if ((ret_val = gst_pad_try_set_caps(v4lmjpegsrc->srcpad, caps)) == GST_PAD_CONNECT_REFUSED)
- return GST_PAD_CONNECT_REFUSED;
- else if (ret_val == GST_PAD_CONNECT_DELAYED)
- return GST_PAD_CONNECT_DELAYED;
+ if ((ret_val = gst_pad_try_set_caps(v4lmjpegsrc->srcpad, caps)) == GST_PAD_LINK_REFUSED)
+ return GST_PAD_LINK_REFUSED;
+ else if (ret_val == GST_PAD_LINK_DELAYED)
+ return GST_PAD_LINK_DELAYED;
if (!gst_v4lmjpegsrc_capture_init(v4lmjpegsrc))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
- return GST_PAD_CONNECT_DONE;
+ return GST_PAD_LINK_DONE;
}
gst_element_add_pad(GST_ELEMENT(v4lsrc), v4lsrc->srcpad);
gst_pad_set_get_function (v4lsrc->srcpad, gst_v4lsrc_get);
- gst_pad_set_connect_function (v4lsrc->srcpad, gst_v4lsrc_srcconnect);
+ gst_pad_set_link_function (v4lsrc->srcpad, gst_v4lsrc_srcconnect);
gst_pad_set_convert_function (v4lsrc->srcpad, gst_v4lsrc_srcconvert);
v4lsrc->bufferpool = gst_buffer_pool_new(
if (GST_V4L_IS_ACTIVE(GST_V4LELEMENT(v4lsrc)))
{
if (!gst_v4lsrc_capture_deinit(v4lsrc))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
else if (!GST_V4L_IS_OPEN(GST_V4LELEMENT(v4lsrc)))
{
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
palette = v4lsrc->palette;
gst_caps_debug (newcaps, "new caps to set on v4lsrc's src pad");
- if ((ret_val = gst_pad_try_set_caps(v4lsrc->srcpad, newcaps)) == GST_PAD_CONNECT_REFUSED)
+ if ((ret_val = gst_pad_try_set_caps(v4lsrc->srcpad, newcaps)) == GST_PAD_LINK_REFUSED)
continue;
- else if (ret_val == GST_PAD_CONNECT_DELAYED)
- return GST_PAD_CONNECT_DELAYED;
+ else if (ret_val == GST_PAD_LINK_DELAYED)
+ return GST_PAD_LINK_DELAYED;
if (!gst_v4lsrc_set_capture(v4lsrc, v4lsrc->width, v4lsrc->height, palette))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
if (!gst_v4lsrc_capture_init(v4lsrc))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
- return GST_PAD_CONNECT_DONE;
+ return GST_PAD_LINK_DONE;
}
/* still nothing - no good caps */
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
const gchar *padname;
GstPad *target;
GstElement *bin;
-} dyn_connect;
+} dyn_link;
static void
-dynamic_connect (GstPadTemplate *templ, GstPad *newpad, gpointer data)
+dynamic_link (GstPadTemplate *templ, GstPad *newpad, gpointer data)
{
- dyn_connect *connect = (dyn_connect *) data;
+ dyn_link *connect = (dyn_link *) data;
if (!strcmp (gst_pad_get_name (newpad), connect->padname)) {
gst_element_set_state (pipeline, GST_STATE_PAUSED);
gst_bin_add (GST_BIN (pipeline), connect->bin);
- gst_pad_connect (newpad, connect->target);
+ gst_pad_link (newpad, connect->target);
gst_element_set_state (pipeline, GST_STATE_PLAYING);
seekable_pads = g_list_prepend (seekable_pads, newpad);
}
static void
-setup_dynamic_connection (GstElement *element, const gchar *padname, GstPad *target, GstElement *bin)
+setup_dynamic_linkion (GstElement *element, const gchar *padname, GstPad *target, GstElement *bin)
{
- dyn_connect *connect;
+ dyn_link *connect;
- connect = g_new0 (dyn_connect, 1);
+ connect = g_new0 (dyn_link, 1);
connect->padname = g_strdup (padname);
connect->target = target;
connect->bin = bin;
- g_signal_connect (G_OBJECT (element), "new_pad", G_CALLBACK (dynamic_connect), connect);
+ g_signal_connect (G_OBJECT (element), "new_pad", G_CALLBACK (dynamic_link), connect);
}
static GstElement*
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), audiosink);
gst_bin_add (GST_BIN (pipeline), videosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
- gst_element_connect (decoder, videosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
+ gst_element_link (decoder, videosink);
seekable = gst_element_get_pad (decoder, "video");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), parser);
gst_bin_add (GST_BIN (pipeline), fakesink);
- gst_element_connect (src, parser);
- gst_element_connect (parser, fakesink);
+ gst_element_link (src, parser);
+ gst_element_link (parser, fakesink);
seekable = gst_element_get_pad (parser, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), decoder);
gst_bin_add (GST_BIN (pipeline), audiosink);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, audiosink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, audiosink);
seekable = gst_element_get_pad (decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (audio_thread), osssink);
gst_bin_add (GST_BIN (pipeline), audio_thread);
- gst_element_connect (src, decoder);
- gst_element_connect (decoder, queue);
- gst_element_connect (queue, osssink);
+ gst_element_link (src, decoder);
+ gst_element_link (decoder, queue);
+ gst_element_link (queue, osssink);
seekable = gst_element_get_pad (queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), src);
gst_bin_add (GST_BIN (pipeline), demux);
- gst_element_connect (src, demux);
+ gst_element_link (src, demux);
audio_bin = gst_bin_new ("a_decoder_bin");
a_decoder = gst_element_factory_make_or_warn ("mad", "a_dec");
audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink");
//g_object_set (G_OBJECT (audiosink), "fragment", 0x00180008, NULL);
a_queue = gst_element_factory_make_or_warn ("queue", "a_queue");
- gst_element_connect (a_decoder, a_queue);
- gst_element_connect (a_queue, audiosink);
+ gst_element_link (a_decoder, a_queue);
+ gst_element_link (a_queue, audiosink);
gst_bin_add (GST_BIN (audio_bin), a_decoder);
gst_bin_add (GST_BIN (audio_bin), audio_thread);
gst_bin_add (GST_BIN (audio_thread), a_queue);
gst_bin_add (GST_BIN (audio_thread), audiosink);
gst_element_set_state (audio_bin, GST_STATE_PAUSED);
- setup_dynamic_connection (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
+ setup_dynamic_linkion (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
seekable = gst_element_get_pad (a_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
//g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
v_queue = gst_element_factory_make_or_warn ("queue", "v_queue");
//g_object_set (G_OBJECT (v_queue), "max_level", 10, NULL);
- gst_element_connect (v_decoder, v_queue);
- gst_element_connect (v_queue, videosink);
+ gst_element_link (v_decoder, v_queue);
+ gst_element_link (v_queue, videosink);
gst_bin_add (GST_BIN (video_bin), v_decoder);
gst_bin_add (GST_BIN (video_bin), video_thread);
gst_bin_add (GST_BIN (video_thread), v_queue);
gst_element_set_state (video_bin, GST_STATE_PAUSED);
- setup_dynamic_connection (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
+ setup_dynamic_linkion (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
seekable = gst_element_get_pad (v_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), src);
gst_bin_add (GST_BIN (pipeline), demux);
- gst_element_connect (src, demux);
+ gst_element_link (src, demux);
audio_bin = gst_bin_new ("a_decoder_bin");
a_decoder = gst_element_factory_make_or_warn ("mad", "a_dec");
a_queue = gst_element_factory_make_or_warn ("queue", "a_queue");
audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink");
g_object_set (G_OBJECT (audiosink), "fragment", 0x00180008, NULL);
- gst_element_connect (a_decoder, a_queue);
- gst_element_connect (a_queue, audiosink);
+ gst_element_link (a_decoder, a_queue);
+ gst_element_link (a_queue, audiosink);
gst_bin_add (GST_BIN (audio_bin), a_decoder);
gst_bin_add (GST_BIN (audio_bin), audio_thread);
gst_bin_add (GST_BIN (audio_thread), a_queue);
gst_bin_add (GST_BIN (audio_thread), audiosink);
- setup_dynamic_connection (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
+ setup_dynamic_linkion (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
seekable = gst_element_get_pad (a_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
v_queue = gst_element_factory_make_or_warn ("queue", "v_queue");
v_filter = gst_element_factory_make_or_warn ("colorspace", "v_filter");
videosink = gst_element_factory_make_or_warn ("xvideosink", "v_sink");
- gst_element_connect_many (v_decoder, v_queue, v_filter, NULL);
+ gst_element_link_many (v_decoder, v_queue, v_filter, NULL);
- gst_element_connect_pads (v_filter, "src", videosink, "sink");
+ gst_element_link (v_filter, videosink);
gst_bin_add_many (GST_BIN (video_bin), v_decoder, video_thread, NULL);
gst_bin_add_many (GST_BIN (video_thread), v_queue, v_filter, videosink, NULL);
- setup_dynamic_connection (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
+ setup_dynamic_linkion (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
seekable = gst_element_get_pad (v_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), src);
gst_bin_add (GST_BIN (pipeline), demux);
- gst_element_connect (src, demux);
+ gst_element_link (src, demux);
audio_bin = gst_bin_new ("a_decoder_bin");
a_decoder = gst_element_factory_make_or_warn ("mad", "a_dec");
audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink");
//g_object_set (G_OBJECT (audiosink), "fragment", 0x00180008, NULL);
g_object_set (G_OBJECT (audiosink), "sync", FALSE, NULL);
- gst_element_connect (a_decoder, a_queue);
- gst_element_connect (a_queue, audiosink);
+ gst_element_link (a_decoder, a_queue);
+ gst_element_link (a_queue, audiosink);
gst_bin_add (GST_BIN (audio_bin), a_decoder);
gst_bin_add (GST_BIN (audio_bin), audio_thread);
gst_bin_add (GST_BIN (audio_thread), a_queue);
gst_bin_add (GST_BIN (audio_thread), audiosink);
- setup_dynamic_connection (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
+ setup_dynamic_linkion (demux, "audio_00", gst_element_get_pad (a_decoder, "sink"), audio_bin);
seekable = gst_element_get_pad (a_queue, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
v_decoder = gst_element_factory_make_or_warn ("mpeg2dec", "v_dec");
v_filter = gst_element_factory_make_or_warn ("colorspace", "v_filter");
videosink = gst_element_factory_make_or_warn ("xvideosink", "v_sink");
- gst_element_connect_many (v_decoder, v_filter, NULL);
+ gst_element_link_many (v_decoder, v_filter, videosink, NULL);
- gst_element_connect_pads (v_filter, "src", videosink, "sink");
gst_bin_add_many (GST_BIN (video_bin), v_decoder, v_filter, videosink, NULL);
- setup_dynamic_connection (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
+ setup_dynamic_linkion (demux, "video_00", gst_element_get_pad (v_decoder, "sink"), video_bin);
seekable = gst_element_get_pad (v_decoder, "src");
seekable_pads = g_list_prepend (seekable_pads, seekable);
gst_bin_add (GST_BIN (pipeline), a_thread);
gst_bin_add (GST_BIN (pipeline), v_thread);
- gst_element_connect (src, decoder);
- gst_element_connect (v_queue, videosink);
- gst_element_connect (decoder, v_queue);
- gst_element_connect (a_queue, audiosink);
- gst_element_connect (decoder, a_queue);
+ gst_element_link (src, decoder);
+ gst_element_link (v_queue, videosink);
+ gst_element_link (decoder, v_queue);
+ gst_element_link (a_queue, audiosink);
+ gst_element_link (decoder, a_queue);
seekable_elements = g_list_prepend (seekable_elements, videosink);
seekable_elements = g_list_prepend (seekable_elements, audiosink);
default:
break;
}
-
walk = g_list_next (walk);
}
}
else {
g_print (" unkown caps type\n");
}
-
}
static void
print_lbs_info (struct probe_context *context, gint stream)
{
const GstFormat *formats;
-
+
/* FIXME: need a better name here */
g_print (" stream info:\n");
definition = gst_format_get_details (format);
/* get start and end position of this stream */
- res = gst_pad_convert (context->pad,
+ res = gst_pad_convert (context->pad,
context->ls_format, stream,
&format, &value_start);
- res &= gst_pad_convert (context->pad,
+ res &= gst_pad_convert (context->pad,
context->ls_format, stream + 1,
&format, &value_end);
if (format == GST_FORMAT_TIME) {
value_end /= (GST_SECOND/100);
- g_print (" %s: %lld:%02lld.%02lld\n", definition->nick,
+ g_print (" %s: %lld:%02lld.%02lld\n", definition->nick,
value_end/6000, (value_end/100)%60, (value_end%100));
}
else {
GValue value = { 0, };
if (!strcmp (pspec->name, "metadata")) {
-
+
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (origin), pspec->name, &value);
context->metadata = g_value_peek_pointer (&value);
}
else if (!strcmp (pspec->name, "streaminfo")) {
-
+
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (origin), pspec->name, &value);
context->streaminfo = g_value_peek_pointer (&value);
GstEvent *event;
gboolean res;
gint count;
-
+
g_print ("info for logical stream %d:\n", stream);
/* seek to stream */
count++;
if (count > 10) break;
}
-
+
print_caps (context->metadata);
print_caps (context->streaminfo);
print_format (context->caps);
print_lbs_info (context, stream);
g_print ("\n");
-
+
return TRUE;
}
gint64 value;
gboolean res;
GstFormat format;
-
+
format = *formats;
formats++;
- res = gst_pad_query (context->pad, GST_QUERY_TOTAL,
+ res = gst_pad_query (context->pad, GST_QUERY_TOTAL,
&format, &value);
definition = gst_format_get_details (format);
if (res) {
if (format == GST_FORMAT_TIME) {
value /= (GST_SECOND/100);
- g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick,
+ g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick,
value/6000, (value/100)%60, (value%100));
}
else {
GstFormat logical_stream_format;
struct probe_context *context;
gint stream;
-
+
gst_init (&argc, &argv);
if (argc < 2) {
gst_bin_add (GST_BIN (pipeline), filesrc);
gst_bin_add (GST_BIN (pipeline), vorbisfile);
- gst_element_connect_pads (filesrc, "src", vorbisfile, "sink");
+ gst_element_link_pads (filesrc, "src", vorbisfile, "sink");
pad = gst_element_get_pad (vorbisfile, "src");
g_assert (pad);
context->pad = pad;
context->ls_format = logical_stream_format;
- g_signal_connect (G_OBJECT (pipeline), "deep_notify",
+ g_signal_connect (G_OBJECT (pipeline), "deep_notify",
G_CALLBACK (deep_notify), context);
-
+
gst_element_set_state (pipeline, GST_STATE_PLAYING);
/* at this point we can inspect the stream */
collect_logical_stream_properties (context, stream);
stream++;
}
-
+
/* stop probe */
gst_element_set_state (pipeline, GST_STATE_NULL);
gst_element_add_pad (fd->input, src_pad);
gst_element_add_pad (fd->output, sink_pad);
- gst_element_connect_many (fd->input, fd->filter, fd->output, NULL);
+ gst_element_link_many (fd->input, fd->filter, fd->output, NULL);
if (fd->pipe_string) g_free (fd->pipe_string);
fd->pipe_string = g_strdup_printf ("%s ! %s ! %s", fd->input_pipe,
}
if (res) {
- /* for the first track (i==0) we wait until we have the
+ /* for the first track (i==0) we wait until we have the
* time of the next track */
if (i > 0) {
gint64 length = time - time_count;
- g_print ("track %d: %lld:%02lld -> %lld:%02lld, length: %lld:%02lld\n", i-1,
- time_count/60, time_count%60,
- time/60, time%60,
- length/60, length%60);
+ g_print ("track %d: %lld:%02lld -> %lld:%02lld, length: %lld:%02lld\n",
+ i-1,
+ time_count / 60, time_count % 60,
+ time / 60, time % 60,
+ length / 60, length % 60);
}
}
else {
GstEvent *event;
gint count;
gboolean res;
-
+
gst_init (&argc, &argv);
pipeline = gst_pipeline_new ("pipeline");
gst_bin_add (GST_BIN (pipeline), cdparanoia);
gst_bin_add (GST_BIN (pipeline), osssink);
- gst_element_connect_pads (cdparanoia, "src", osssink, "sink");
+ gst_element_link_pads (cdparanoia, "src", osssink, "sink");
- g_signal_connect (G_OBJECT (pipeline), "deep_notify",
+ g_signal_connect (G_OBJECT (pipeline), "deep_notify",
G_CALLBACK (gst_element_default_deep_notify), NULL);
-
+
gst_element_set_state (pipeline, GST_STATE_PAUSED);
/* now we go into probe mode */
/* seek to track3 */
event = gst_event_new_seek (track_format |
GST_SEEK_METHOD_SET |
- GST_SEEK_FLAG_FLUSH,
+ GST_SEEK_FLAG_FLUSH,
3);
res = gst_pad_send_event (pad, event);
/* seek to some seconds */
event = gst_event_new_segment_seek (GST_FORMAT_TIME |
GST_SEEK_METHOD_SET |
- GST_SEEK_FLAG_FLUSH,
+ GST_SEEK_FLAG_FLUSH,
25 * GST_SECOND, 29 * GST_SECOND);
res = gst_pad_send_event (pad, event);
if (!res)
gst_bin_add (GST_BIN (pipeline), a_thread);
gst_bin_add (GST_BIN (pipeline), v_thread);
- gst_element_connect (src, decoder);
- gst_element_connect (v_queue, videosink);
- gst_element_connect (decoder, v_queue);
- gst_element_connect (a_queue, audiosink);
- gst_element_connect (decoder, a_queue);
+ gst_element_link (src, decoder);
+ gst_element_link (v_queue, videosink);
+ gst_element_link (decoder, v_queue);
+ gst_element_link (a_queue, audiosink);
+ gst_element_link (decoder, a_queue);
seekable_elements = g_list_prepend (seekable_elements, videosink);
seekable_elements = g_list_prepend (seekable_elements, audiosink);
default:
break;
}
-
walk = g_list_next (walk);
}
}
else {
g_print (" unkown caps type\n");
}
-
}
static void
print_lbs_info (struct probe_context *context, gint stream)
{
const GstFormat *formats;
-
+
/* FIXME: need a better name here */
g_print (" stream info:\n");
definition = gst_format_get_details (format);
/* get start and end position of this stream */
- res = gst_pad_convert (context->pad,
+ res = gst_pad_convert (context->pad,
context->ls_format, stream,
&format, &value_start);
- res &= gst_pad_convert (context->pad,
+ res &= gst_pad_convert (context->pad,
context->ls_format, stream + 1,
&format, &value_end);
if (format == GST_FORMAT_TIME) {
value_end /= (GST_SECOND/100);
- g_print (" %s: %lld:%02lld.%02lld\n", definition->nick,
+ g_print (" %s: %lld:%02lld.%02lld\n", definition->nick,
value_end/6000, (value_end/100)%60, (value_end%100));
}
else {
GValue value = { 0, };
if (!strcmp (pspec->name, "metadata")) {
-
+
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (origin), pspec->name, &value);
context->metadata = g_value_peek_pointer (&value);
}
else if (!strcmp (pspec->name, "streaminfo")) {
-
+
g_value_init (&value, pspec->value_type);
g_object_get_property (G_OBJECT (origin), pspec->name, &value);
context->streaminfo = g_value_peek_pointer (&value);
GstEvent *event;
gboolean res;
gint count;
-
+
g_print ("info for logical stream %d:\n", stream);
/* seek to stream */
count++;
if (count > 10) break;
}
-
+
print_caps (context->metadata);
print_caps (context->streaminfo);
print_format (context->caps);
print_lbs_info (context, stream);
g_print ("\n");
-
+
return TRUE;
}
gint64 value;
gboolean res;
GstFormat format;
-
+
format = *formats;
formats++;
- res = gst_pad_query (context->pad, GST_QUERY_TOTAL,
+ res = gst_pad_query (context->pad, GST_QUERY_TOTAL,
&format, &value);
definition = gst_format_get_details (format);
if (res) {
if (format == GST_FORMAT_TIME) {
value /= (GST_SECOND/100);
- g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick,
+ g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick,
value/6000, (value/100)%60, (value%100));
}
else {
GstFormat logical_stream_format;
struct probe_context *context;
gint stream;
-
+
gst_init (&argc, &argv);
if (argc < 2) {
gst_bin_add (GST_BIN (pipeline), filesrc);
gst_bin_add (GST_BIN (pipeline), vorbisfile);
- gst_element_connect_pads (filesrc, "src", vorbisfile, "sink");
+ gst_element_link_pads (filesrc, "src", vorbisfile, "sink");
pad = gst_element_get_pad (vorbisfile, "src");
g_assert (pad);
context->pad = pad;
context->ls_format = logical_stream_format;
- g_signal_connect (G_OBJECT (pipeline), "deep_notify",
+ g_signal_connect (G_OBJECT (pipeline), "deep_notify",
G_CALLBACK (deep_notify), context);
-
+
gst_element_set_state (pipeline, GST_STATE_PLAYING);
/* at this point we can inspect the stream */
collect_logical_stream_properties (context, stream);
stream++;
}
-
+
/* stop probe */
gst_element_set_state (pipeline, GST_STATE_NULL);
projects / platform / upstream / gst-plugins-base.git / commitdiff