From: David Schleef Date: Thu, 15 Sep 2005 06:59:36 +0000 (+0000) Subject: Fixes for changes in registry API. X-Git-Tag: RELEASE-0_9_3~64 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb8927cb928327a99cd733a8b90c32412f1a7da2;p=platform%2Fupstream%2Fgst-plugins-base.git Fixes for changes in registry API. Original commit message from CVS: * check/generic/states.c: * ext/ogg/gstoggdemux.c: (gst_ogg_pad_typefind): * gst/playback/gstdecodebin.c: (gst_decode_bin_init): Fixes for changes in registry API. * configure.ac: Only export gst_plugins_desc. Add -no-undefined to GST_PLUGIN_LDFLAGS. * ext/libvisual/visual.c: Make the library shut up. * gst-libs/gst/audio/audio.c: Don't define a plugin in a library. * gst-libs/gst/audio/gstaudiofilter.c: same --- diff --git a/ChangeLog b/ChangeLog index 0707561..931851e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-09-14 David Schleef + + * check/generic/states.c: + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_typefind): + * gst/playback/gstdecodebin.c: (gst_decode_bin_init): + Fixes for changes in registry API. + + * configure.ac: Only export gst_plugins_desc. Add -no-undefined + to GST_PLUGIN_LDFLAGS. + * ext/libvisual/visual.c: Make the library shut up. + * gst-libs/gst/audio/audio.c: Don't define a plugin in a library. + * gst-libs/gst/audio/gstaudiofilter.c: same + 2005-09-14 Thomas Vander Stichele * docs/plugins/Makefile.am: diff --git a/check/generic/states.c b/check/generic/states.c index c8ed360..9a92777 100644 --- a/check/generic/states.c +++ b/check/generic/states.c @@ -29,7 +29,8 @@ GST_START_TEST (test_state_changes) GstElement *element; GList *features, *f; - features = gst_registry_pool_feature_list (GST_TYPE_ELEMENT_FACTORY); + features = gst_registry_get_feature_list (gst_registry_get_default (), + GST_TYPE_ELEMENT_FACTORY); for (f = features; f; f = f->next) { GstPluginFeature *feature = f->data; diff --git a/common b/common index 22ed117..97fbc2d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 22ed11765884ef97b7346f0723ffc0e7fe540640 +Subproject commit 97fbc2dd78ea0cc2225b63ff383802b7c376d9b7 diff --git a/configure.ac b/configure.ac index 201f9f7..8faf4e0 100644 --- a/configure.ac +++ b/configure.ac @@ -286,7 +286,7 @@ AC_SUBST(plugindir) dnl this really should only contain flags, not libs - they get added before dnl whatevertarget_LIBS and -L flags here affect the rest of the linking -GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*'" +GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$' -no-undefined" AC_SUBST(GST_PLUGIN_LDFLAGS) dnl these are all the gst plug-ins, compilable without additional libs diff --git a/ext/libvisual/visual.c b/ext/libvisual/visual.c index 2377a1b..2c1f57b 100644 --- a/ext/libvisual/visual.c +++ b/ext/libvisual/visual.c @@ -134,18 +134,6 @@ gst_visual_get_type (void) }; type = g_type_register_static (GST_TYPE_ELEMENT, "GstVisual", &info, 0); - - GST_DEBUG_CATEGORY_INIT (libvisual_debug, "libvisual", 0, - "libvisual audio visualisations"); - visual_log_set_verboseness (VISUAL_LOG_VERBOSENESS_MEDIUM); - visual_log_set_info_handler (libvisual_log_handler, - (void *) GST_LEVEL_INFO); - visual_log_set_warning_handler (libvisual_log_handler, - (void *) GST_LEVEL_WARNING); - visual_log_set_critical_handler (libvisual_log_handler, - (void *) GST_LEVEL_ERROR); - visual_log_set_error_handler (libvisual_log_handler, - (void *) GST_LEVEL_ERROR); } return type; } @@ -532,10 +520,23 @@ plugin_init (GstPlugin * plugin) guint i; VisList *list; + GST_DEBUG_CATEGORY_INIT (libvisual_debug, "libvisual", 0, + "libvisual audio visualisations"); + if (!visual_is_initialized ()) if (visual_init (NULL, NULL) != 0) return FALSE; + GST_ERROR ("got here"); + visual_log_set_verboseness (VISUAL_LOG_VERBOSENESS_LOW); + visual_log_set_info_handler (libvisual_log_handler, (void *) GST_LEVEL_INFO); + visual_log_set_warning_handler (libvisual_log_handler, + (void *) GST_LEVEL_WARNING); + visual_log_set_critical_handler (libvisual_log_handler, + (void *) GST_LEVEL_ERROR); + visual_log_set_error_handler (libvisual_log_handler, + (void *) GST_LEVEL_ERROR); + list = visual_actor_get_list (); for (i = 0; i < visual_list_count (list); i++) { VisPluginRef *ref = visual_list_get (list, i); diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 7713c5a..0c66c3a 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -621,7 +621,7 @@ gst_ogg_pad_typefind (GstOggPad * pad, ogg_packet * packet) GList *factories; /* first filter out the interesting element factories */ - factories = gst_registry_pool_feature_filter ( + factories = gst_default_registry_feature_filter ( (GstPluginFeatureFilter) gst_ogg_demux_factory_filter, FALSE, caps); /* sort them according to their ranks */ diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index b6a1edb..6385ce0 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -264,17 +264,3 @@ gst_audio_structure_set_int (GstStructure * structure, GstAudioFieldFlag flag) gst_structure_set (structure, "buffer-frames", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); } - -static gboolean -plugin_init (GstPlugin * plugin) -{ - gst_audio_channel_position_get_type (); - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstaudio", - "Support services for audio plugins", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN); diff --git a/gst-libs/gst/audio/gstaudiofilter.c b/gst-libs/gst/audio/gstaudiofilter.c index f92ebdd..a526700 100644 --- a/gst-libs/gst/audio/gstaudiofilter.c +++ b/gst-libs/gst/audio/gstaudiofilter.c @@ -302,15 +302,3 @@ gst_audio_filter_class_add_pad_templates (GstAudiofilterClass * gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, gst_caps_copy (caps))); } - -static gboolean -plugin_init (GstPlugin * plugin) -{ - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstaudiofilter", - "Audio filter parent class", - plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index 7f90275..cc80114 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -296,7 +296,7 @@ gst_decode_bin_init (GstDecodeBin * decode_bin) GList *factories; /* first filter out the interesting element factories */ - factories = gst_registry_pool_feature_filter ( + factories = gst_default_registry_feature_filter ( (GstPluginFeatureFilter) gst_decode_bin_factory_filter, FALSE, decode_bin); diff --git a/tests/check/generic/states.c b/tests/check/generic/states.c index c8ed360..9a92777 100644 --- a/tests/check/generic/states.c +++ b/tests/check/generic/states.c @@ -29,7 +29,8 @@ GST_START_TEST (test_state_changes) GstElement *element; GList *features, *f; - features = gst_registry_pool_feature_list (GST_TYPE_ELEMENT_FACTORY); + features = gst_registry_get_feature_list (gst_registry_get_default (), + GST_TYPE_ELEMENT_FACTORY); for (f = features; f; f = f->next) { GstPluginFeature *feature = f->data;