diff --git a/ChangeLog b/ChangeLog index 67f7a9ddef..2ca8668e68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-21 Wim Taymans + + * docs/manual/advanced-autoplugging.xml: + * docs/manual/basics-helloworld.xml: + * docs/manual/basics-pads.xml: + * docs/manual/highlevel-components.xml: + Avoid using a bad function in the example code. + 2008-05-21 Wim Taymans * gst/gstclock.c: (gst_clock_set_calibration): diff --git a/docs/manual/advanced-autoplugging.xml b/docs/manual/advanced-autoplugging.xml index 118671ca54..6e86146634 100644 --- a/docs/manual/advanced-autoplugging.xml +++ b/docs/manual/advanced-autoplugging.xml @@ -366,7 +366,7 @@ close_link (GstPad *srcpad, gst_bin_add (GST_BIN (pipeline), sinkelement); gst_element_set_state (sinkelement, GST_STATE_READY); } - pad = gst_element_get_pad (sinkelement, padname); + pad = gst_element_get_static_pad (sinkelement, padname); gst_pad_link (srcpad, pad); if (sinkelement != audiosink) { gst_element_set_state (sinkelement, GST_STATE_PAUSED); @@ -386,7 +386,7 @@ close_link (GstPad *srcpad, switch (templ->presence) { case GST_PAD_ALWAYS: { - GstPad *pad = gst_element_get_pad (sinkelement, templ->name_template); + GstPad *pad = gst_element_get_static_pad (sinkelement, templ->name_template); GstCaps *caps = gst_pad_get_caps (pad); /* link */ @@ -419,7 +419,7 @@ try_to_plug (GstPad *pad, GstCaps *res, *audiocaps; /* don't plug if we're already plugged - FIXME: memleak for pad */ - if (GST_PAD_IS_LINKED (gst_element_get_pad (audiosink, "sink"))) { + if (GST_PAD_IS_LINKED (gst_element_get_static_pad (audiosink, "sink"))) { g_print ("Omitting link for pad %s:%s because we're already linked\n", GST_OBJECT_NAME (parent), GST_OBJECT_NAME (pad)); return; @@ -434,7 +434,7 @@ try_to_plug (GstPad *pad, } /* can it link to the audiopad? */ - audiocaps = gst_pad_get_caps (gst_element_get_pad (audiosink, "sink")); + audiocaps = gst_pad_get_caps (gst_element_get_static_pad (audiosink, "sink")); res = gst_caps_intersect (caps, audiocaps); if (res && !gst_caps_is_empty (res)) { g_print ("Found pad to link to audiosink - plugging is now done\n"); @@ -503,7 +503,7 @@ cb_typefound (GstElement *typefind, g_free (s); /* actually plug now */ - pad = gst_element_get_pad (typefind, "src"); + pad = gst_element_get_static_pad (typefind, "src"); try_to_plug (pad, caps); gst_object_unref (GST_OBJECT (pad)); } diff --git a/docs/manual/basics-helloworld.xml b/docs/manual/basics-helloworld.xml index 890ed93b6a..5aa9f128b6 100644 --- a/docs/manual/basics-helloworld.xml +++ b/docs/manual/basics-helloworld.xml @@ -108,7 +108,7 @@ new_pad (GstElement *element, /* We can now link this pad with the audio decoder */ g_print ("Dynamic pad created, linking parser/decoder\n"); - sinkpad = gst_element_get_pad (decoder, "sink"); + sinkpad = gst_element_get_static_pad (decoder, "sink"); gst_pad_link (pad, sinkpad); gst_object_unref (sinkpad); diff --git a/docs/manual/basics-pads.xml b/docs/manual/basics-pads.xml index af45559c21..cad954cc47 100644 --- a/docs/manual/basics-pads.xml +++ b/docs/manual/basics-pads.xml @@ -656,7 +656,7 @@ main (int argc, gst_bin_add (GST_BIN (bin), sink); /* add ghostpad */ - pad = gst_element_get_pad (sink, "sink"); + pad = gst_element_get_static_pad (sink, "sink"); gst_element_add_pad (bin, gst_ghost_pad_new ("sink", pad)); gst_object_unref (GST_OBJECT (pad)); diff --git a/docs/manual/highlevel-components.xml b/docs/manual/highlevel-components.xml index a56e19cc89..15adbe7013 100644 --- a/docs/manual/highlevel-components.xml +++ b/docs/manual/highlevel-components.xml @@ -243,7 +243,7 @@ cb_newpad (GstElement *decodebin, GstPad *audiopad; /* only link once */ - audiopad = gst_element_get_pad (audio, "sink"); + audiopad = gst_element_get_static_pad (audio, "sink"); if (GST_PAD_IS_LINKED (audiopad)) { g_object_unref (audiopad); return; @@ -299,7 +299,7 @@ main (gint argc, /* create audio output */ audio = gst_bin_new ("audiobin"); conv = gst_element_factory_make ("audioconvert", "aconv"); - audiopad = gst_element_get_pad (conv, "sink"); + audiopad = gst_element_get_static_pad (conv, "sink"); sink = gst_element_factory_make ("alsasink", "sink"); gst_bin_add_many (GST_BIN (audio), conv, sink, NULL); gst_element_link (conv, sink);