diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-14 17:54:22 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-14 17:54:22 +0000 |
commit | c01cd4e835c47d81677f6d8bcf8ddd9acdf6ff6a (patch) | |
tree | 5b5b62d0136246d70b27c3b803e7d19e955f6062 | |
parent | cd0291481239c01be9cdb2b989cff632e73dfccf (diff) |
g_error fix, m/m version fixBEFORE_INDENT
Original commit message from CVS:
g_error fix, m/m version fix
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | gst/registries/gstxmlregistry.c | 2 | ||||
-rwxr-xr-x | tools/gst-feedback-m.m | 28 | ||||
-rwxr-xr-x | tools/gst-indent | 2 |
4 files changed, 28 insertions, 13 deletions
@@ -1,5 +1,14 @@ 2004-03-14 Thomas Vander Stichele <thomas at apestaart dot org> + * gst/registries/gstxmlregistry.c: (gst_xml_registry_load_plugin): + g_error_free the g_error + * tools/gst-feedback-m.m: + check for other versions of gstreamer + * tools/gst-indent: + use sh, not bash + +2004-03-14 Thomas Vander Stichele <thomas at apestaart dot org> + * tools/gst-register.c: do not spill paths when registries are not writable, until we fix the "user running gst-register" case. diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c index a805f1af4..b491bba50 100644 --- a/gst/registries/gstxmlregistry.c +++ b/gst/registries/gstxmlregistry.c @@ -141,6 +141,7 @@ gst_xml_registry_get_type (void) (GInstanceInitFunc) gst_xml_registry_init, NULL }; + xml_registry_type = g_type_register_static (GST_TYPE_REGISTRY, "GstXMLRegistry", &xml_registry_info, 0); } @@ -638,6 +639,7 @@ gst_xml_registry_load_plugin (GstRegistry * registry, GstPlugin * plugin) if (error) { g_warning ("could not load plugin %s: %s", plugin->desc.name, error->message); + g_error_free (error); } return GST_REGISTRY_PLUGIN_LOAD_ERROR; } else if (loaded_plugin != plugin) { diff --git a/tools/gst-feedback-m.m b/tools/gst-feedback-m.m index 28c187674..3577f341f 100755 --- a/tools/gst-feedback-m.m +++ b/tools/gst-feedback-m.m @@ -36,14 +36,18 @@ command_output "id" echo echo "+ PKG-CONFIG INFORMATION" -command_output "pkg-config --version" -command_output "pkg-config gstreamer --modversion" -command_output "pkg-config gstreamer --cflags" -command_output "pkg-config gstreamer --libs" -command_output "pkg-config gstreamer-libs --modversion" -command_output "pkg-config gstreamer-libs --cflags" -command_output "pkg-config gstreamer-libs --libs" -echo +for mm in 0.6 0.7 0.8 +do + echo "+ $mm" + command_output "pkg-config --version" + command_output "pkg-config gstreamer-$mm --modversion" + command_output "pkg-config gstreamer-$mm --cflags" + command_output "pkg-config gstreamer-$mm --libs" + command_output "pkg-config gstreamer-libs-$mm --modversion" + command_output "pkg-config gstreamer-libs-$mm --cflags" + command_output "pkg-config gstreamer-libs-$mm --libs" + echo +done echo "+ GSTREAMER INFORMATION" command_output "which gst-register" @@ -53,13 +57,13 @@ command_output "gst-inspect fakesink" command_output "gst-launch fakesrc num_buffers=5 ! fakesink" echo "++ looking for gstreamer libraries in common locations" -for dirs in /usr/lib /usr/local/lib /home; do +for dirs in /usr/lib /usr/local/lib; do if test -d $dirs; then find $dirs -name libgstreamer* | grep so fi done echo "++ looking for gstreamer headers in common locations" -for dirs in /usr/include /usr/local/include /home; do +for dirs in /usr/include /usr/local/include; do if test -d $dirs; then find $dirs -name gst.h fi @@ -69,13 +73,13 @@ echo "+ GSTREAMER PLUG-INS INFORMATION" command_output "gst-inspect volume" echo "++ looking for gstreamer volume plugin in common locations" -for dirs in /usr/lib /usr/local/lib /home; do +for dirs in /usr/lib /usr/local/lib; do if test -d $dirs; then find $dirs -name libgstvolume* | grep so fi done echo "++ looking for gstreamer headers in common locations" -for dirs in /usr/include /usr/local/include /home; do +for dirs in /usr/include /usr/local/include; do if test -d $dirs; then find $dirs -name audio.h fi diff --git a/tools/gst-indent b/tools/gst-indent index 26e649661..7c150bfe8 100755 --- a/tools/gst-indent +++ b/tools/gst-indent @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh indent \ --braces-on-if-line \ --blank-lines-after-declarations \ |