mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

disable debugging when it hasn't been initialized yet. Fixes testsuite

Browse source 
Original commit message from CVS:
disable debugging when it hasn't been initialized yet. Fixes testsuite
This commit is contained in:
Benjamin Otte 2003-11-04 17:27:22 +00:00
parent 4a549c798b
commit b940244e53
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/gstplugin.c
View file

@ -82,16 +82,16 @@ void
_gst_plugin_register_static (GstPluginDesc *desc) _gst_plugin_register_static (GstPluginDesc *desc)
{ {
if (main_module == NULL) { if (main_module == NULL) {
GST_LOG ("queueing static plugin \"%s\" for loading later on", desc->name); if (GST_CAT_DEFAULT) GST_LOG ("queueing static plugin \"%s\" for loading later on", desc->name);
_gst_plugin_static = g_list_prepend (_gst_plugin_static, desc); _gst_plugin_static = g_list_prepend (_gst_plugin_static, desc);
} }
else { else {
GstPlugin *plugin; GstPlugin *plugin;
GST_LOG ("attempting to load static plugin \"%s\" now...", desc->name); if (GST_CAT_DEFAULT) GST_LOG ("attempting to load static plugin \"%s\" now...", desc->name);
plugin = g_new0 (GstPlugin, 1); plugin = g_new0 (GstPlugin, 1);
if (gst_plugin_register_func (plugin, main_module, desc)) { if (gst_plugin_register_func (plugin, main_module, desc)) {
GST_INFO ("loaded static plugin \"%s\"", desc->name); if (GST_CAT_DEFAULT) GST_INFO ("loaded static plugin \"%s\"", desc->name);
gst_registry_pool_add_plugin (plugin); gst_registry_pool_add_plugin (plugin);
} }
} }
@ -142,20 +142,20 @@ gst_plugin_register_func (GstPlugin *plugin, GModule *module, GstPluginDesc *des
g_assert (plugin->module == NULL); g_assert (plugin->module == NULL);
if (!gst_plugin_check_version (desc->major_version, desc->minor_version)) { if (!gst_plugin_check_version (desc->major_version, desc->minor_version)) {
GST_INFO ("plugin \"%s\" has incompatible version, not loading", if (GST_CAT_DEFAULT) GST_INFO ("plugin \"%s\" has incompatible version, not loading",
plugin->filename); plugin->filename);
return FALSE; return FALSE;
} }
if (!desc->license || !desc->description || !desc->package || if (!desc->license || !desc->description || !desc->package ||
!desc->copyright || !desc->origin) { !desc->copyright || !desc->origin) {
GST_INFO ("plugin \"%s\" has incorrect GstPluginDesc, not loading", if (GST_CAT_DEFAULT) GST_INFO ("plugin \"%s\" has incorrect GstPluginDesc, not loading",
plugin->filename); plugin->filename);
return FALSE; return FALSE;
} }
if (!gst_plugin_check_license (desc->license)) { if (!gst_plugin_check_license (desc->license)) {
GST_INFO ("plugin \"%s\" has invalid license \"%s\", not loading", if (GST_CAT_DEFAULT) GST_INFO ("plugin \"%s\" has invalid license \"%s\", not loading",
plugin->filename, desc->license); plugin->filename, desc->license);
return FALSE; return FALSE;
} }
@ -164,12 +164,12 @@ gst_plugin_register_func (GstPlugin *plugin, GModule *module, GstPluginDesc *des
plugin->module = module; plugin->module = module;
if (!((desc->plugin_init) (plugin))) { if (!((desc->plugin_init) (plugin))) {
GST_INFO ("plugin \"%s\" failed to initialise", plugin->filename); if (GST_CAT_DEFAULT) GST_INFO ("plugin \"%s\" failed to initialise", plugin->filename);
plugin->module = NULL; plugin->module = NULL;
return FALSE; return FALSE;
} }
GST_DEBUG ("plugin \"%s\" initialised", GST_STR_NULL (plugin->filename)); if (GST_CAT_DEFAULT) GST_DEBUG ("plugin \"%s\" initialised", GST_STR_NULL (plugin->filename));
return plugin; return plugin;
} }

3
tests/old/testsuite/plugin/Makefile.am
View file

@ -2,8 +2,7 @@ include ../Rules
plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
tests_pass = dynamic linked loading registry tests_pass = dynamic linked loading registry static static2
tests_fail = static static2
libtestplugin_la_SOURCES = testplugin.c libtestplugin_la_SOURCES = testplugin.c

3
testsuite/plugin/Makefile.am
View file

@ -2,8 +2,7 @@ include ../Rules
plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
tests_pass = dynamic linked loading registry tests_pass = dynamic linked loading registry static static2
tests_fail = static static2
libtestplugin_la_SOURCES = testplugin.c libtestplugin_la_SOURCES = testplugin.c