From 66f00f1c78b8c9c9e2ec803d985aa1f522114b06 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 16 Apr 2004 01:34:05 +0000 Subject: [PATCH] docs/gst/gstreamer-sections.txt: Remove deprecated symbols. Original commit message from CVS: * docs/gst/gstreamer-sections.txt: Remove deprecated symbols. * docs/gst/tmpl/gstinfo.sgml: same * docs/gst/tmpl/gstutils.sgml: Remove a bunch of bogus crap that gtk-doc put here. * gst/gstutils.h: Remove the \ that was confusing gtk-doc. * examples/queue/queue.c: (main): We iterate pipelines, not bins. (bug #139996) --- ChangeLog | 10 ++++++ docs/gst/gstreamer-sections.txt | 6 ---- docs/gst/tmpl/gstinfo.sgml | 52 -------------------------------- docs/gst/tmpl/gstutils.sgml | 23 +------------- examples/queue/queue.c | 20 ++++++------ gst/gstutils.h | 3 +- tests/old/examples/queue/queue.c | 20 ++++++------ 7 files changed, 32 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dec486aa7..a8a5f1c316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-04-15 David Schleef + + * docs/gst/gstreamer-sections.txt: Remove deprecated symbols. + * docs/gst/tmpl/gstinfo.sgml: same + * docs/gst/tmpl/gstutils.sgml: Remove a bunch of bogus crap that + gtk-doc put here. + * gst/gstutils.h: Remove the \ that was confusing gtk-doc. + * examples/queue/queue.c: (main): We iterate pipelines, not + bins. (bug #139996) + 2004-04-15 Ronald Bultje * docs/pwg/advanced-types.xml: diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 51f9d05289..e5d24bcdf1 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1742,12 +1742,6 @@ GST_WARNING GST_INFO GST_DEBUG GST_LOG -GST_INFO_ELEMENT -GST_DEBUG_ELEMENT -GST_DEBUG_ENTER -GST_DEBUG_LEAVE -GST_INFO_ENTER -GST_INFO_LEAVE GST_DEBUG_FUNCPTR GST_DEBUG_FUNCPTR_NAME gst_debug_set_log_function diff --git a/docs/gst/tmpl/gstinfo.sgml b/docs/gst/tmpl/gstinfo.sgml index a14f4cea78..a4c8411235 100644 --- a/docs/gst/tmpl/gstinfo.sgml +++ b/docs/gst/tmpl/gstinfo.sgml @@ -692,58 +692,6 @@ Output a logging message in the default category. @...: printf-style message to output - - - - - -@cat: -@obj: -@...: - - - - - - - -@cat: -@obj: -@...: - - - - - - - -@...: - - - - - - - -@...: - - - - - - - -@...: - - - - - - - -@...: - - Register a pointer to a function with its name, so it can later be used by diff --git a/docs/gst/tmpl/gstutils.sgml b/docs/gst/tmpl/gstutils.sgml index e2e178acbf..ecdc13707c 100644 --- a/docs/gst/tmpl/gstutils.sgml +++ b/docs/gst/tmpl/gstutils.sgml @@ -70,28 +70,7 @@ gstutils @type: @type_as_function: @parent_type: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: -@\ - parent_type_macro: +@parent_type_macro: @additional_initializations: diff --git a/examples/queue/queue.c b/examples/queue/queue.c index 7e027839ed..67b8a2321f 100644 --- a/examples/queue/queue.c +++ b/examples/queue/queue.c @@ -5,7 +5,7 @@ int main (int argc, char *argv[]) { GstElement *filesrc, *osssink, *parse, *decode, *queue; - GstElement *bin; + GstElement *pipeline; GstElement *thread; gst_init (&argc, &argv); @@ -19,9 +19,9 @@ main (int argc, char *argv[]) thread = gst_thread_new ("thread"); g_assert (thread != NULL); - /* create a new bin to hold the elements */ - bin = gst_bin_new ("bin"); - g_assert (bin != NULL); + /* create a new pipeline to hold the elements */ + pipeline = gst_pipeline_new ("pipeline"); + g_assert (pipeline != NULL); /* create a disk reader */ filesrc = gst_element_factory_make ("filesrc", "disk_source"); @@ -29,7 +29,7 @@ main (int argc, char *argv[]) g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL); parse = gst_element_factory_make ("mp3parse", "parse"); - decode = gst_element_factory_make ("mpg123", "decode"); + decode = gst_element_factory_make ("mad", "decode"); queue = gst_element_factory_make ("queue", "queue"); @@ -38,19 +38,19 @@ main (int argc, char *argv[]) g_assert (osssink != NULL); /* add objects to the main pipeline */ - gst_bin_add_many (GST_BIN (bin), filesrc, parse, decode, queue, NULL); + gst_bin_add_many (GST_BIN (pipeline), filesrc, parse, decode, queue, NULL); gst_bin_add (GST_BIN (thread), osssink); - gst_bin_add (GST_BIN (bin), thread); + gst_bin_add (GST_BIN (pipeline), thread); gst_element_link_many (filesrc, parse, decode, queue, osssink, NULL); /* start playing */ - gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); + gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); - while (gst_bin_iterate (GST_BIN (bin))); + while (gst_bin_iterate (GST_BIN (pipeline))); - gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); + gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); exit (0); } diff --git a/gst/gstutils.h b/gst/gstutils.h index bc412fa454..e9b841e256 100644 --- a/gst/gstutils.h +++ b/gst/gstutils.h @@ -46,8 +46,7 @@ void gst_print_element_args (GString *buf, gint indent, GstElement *element) void additional_initializations (GType type) is for initializing interfaces and stuff like that */ -#define GST_BOILERPLATE_FULL(type, type_as_function, parent_type, \ - parent_type_macro, additional_initializations) \ +#define GST_BOILERPLATE_FULL(type, type_as_function, parent_type, parent_type_macro, additional_initializations) \ \ static void type_as_function ## _base_init (gpointer g_class); \ static void type_as_function ## _class_init (type ## Class *g_class); \ diff --git a/tests/old/examples/queue/queue.c b/tests/old/examples/queue/queue.c index 7e027839ed..67b8a2321f 100644 --- a/tests/old/examples/queue/queue.c +++ b/tests/old/examples/queue/queue.c @@ -5,7 +5,7 @@ int main (int argc, char *argv[]) { GstElement *filesrc, *osssink, *parse, *decode, *queue; - GstElement *bin; + GstElement *pipeline; GstElement *thread; gst_init (&argc, &argv); @@ -19,9 +19,9 @@ main (int argc, char *argv[]) thread = gst_thread_new ("thread"); g_assert (thread != NULL); - /* create a new bin to hold the elements */ - bin = gst_bin_new ("bin"); - g_assert (bin != NULL); + /* create a new pipeline to hold the elements */ + pipeline = gst_pipeline_new ("pipeline"); + g_assert (pipeline != NULL); /* create a disk reader */ filesrc = gst_element_factory_make ("filesrc", "disk_source"); @@ -29,7 +29,7 @@ main (int argc, char *argv[]) g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL); parse = gst_element_factory_make ("mp3parse", "parse"); - decode = gst_element_factory_make ("mpg123", "decode"); + decode = gst_element_factory_make ("mad", "decode"); queue = gst_element_factory_make ("queue", "queue"); @@ -38,19 +38,19 @@ main (int argc, char *argv[]) g_assert (osssink != NULL); /* add objects to the main pipeline */ - gst_bin_add_many (GST_BIN (bin), filesrc, parse, decode, queue, NULL); + gst_bin_add_many (GST_BIN (pipeline), filesrc, parse, decode, queue, NULL); gst_bin_add (GST_BIN (thread), osssink); - gst_bin_add (GST_BIN (bin), thread); + gst_bin_add (GST_BIN (pipeline), thread); gst_element_link_many (filesrc, parse, decode, queue, osssink, NULL); /* start playing */ - gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); + gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); - while (gst_bin_iterate (GST_BIN (bin))); + while (gst_bin_iterate (GST_BIN (pipeline))); - gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); + gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); exit (0); }