mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

make --disable-index work (#342564)

Browse source 
Original commit message from CVS:
* gst/gstregistry.h:
* gst/gstregistryxml.c: (load_feature),
(gst_registry_xml_read_cache), (gst_registry_xml_save_feature):
* win32/common/config.h:
make --disable-index work (#342564)
This commit is contained in:
Stefan Kost 2006-07-18 19:01:25 +00:00
parent c491702400
commit 41bad82bfa
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-07-18 Stefan Kost <ensonic@users.sf.net>
* gst/gstregistry.h:
* gst/gstregistryxml.c: (load_feature),
(gst_registry_xml_read_cache), (gst_registry_xml_save_feature):
* win32/common/config.h:
make --disable-index work (#342564)
2006-07-18 Wim Taymans <wim@fluendo.com> 2006-07-18 Wim Taymans <wim@fluendo.com>
Patch by: Peter Kjellerstedt <pkj at axis dot com> Patch by: Peter Kjellerstedt <pkj at axis dot com>

1
gst/gstregistry.h
View file

@ -25,6 +25,7 @@
#define __GST_REGISTRY_H__ #define __GST_REGISTRY_H__
#include <stdio.h> /* FIXME: because of cache_file below */ #include <stdio.h> /* FIXME: because of cache_file below */
#include <gst/gstconfig.h>
#include <gst/gstplugin.h> #include <gst/gstplugin.h>
#include <gst/gstpluginfeature.h> #include <gst/gstpluginfeature.h>

6
gst/gstregistryxml.c
View file

@ -352,11 +352,13 @@ load_feature (xmlTextReaderPtr reader)
g_free (s); g_free (s);
} }
} }
#ifndef GST_DISABLE_INDEX
} else if (GST_IS_INDEX_FACTORY (feature)) { } else if (GST_IS_INDEX_FACTORY (feature)) {
GstIndexFactory *factory = GST_INDEX_FACTORY (feature); GstIndexFactory *factory = GST_INDEX_FACTORY (feature);
if (g_str_equal (tag, "longdesc")) if (g_str_equal (tag, "longdesc"))
read_string (reader, &factory->longdesc, TRUE); read_string (reader, &factory->longdesc, TRUE);
#endif
} }
} }
} }
@ -497,7 +499,9 @@ gst_registry_xml_read_cache (GstRegistry * registry, const char *location)
/* make sure these types exist */ /* make sure these types exist */
GST_TYPE_ELEMENT_FACTORY; GST_TYPE_ELEMENT_FACTORY;
GST_TYPE_TYPE_FIND_FACTORY; GST_TYPE_TYPE_FIND_FACTORY;
#ifndef GST_DISABLE_INDEX
GST_TYPE_INDEX_FACTORY; GST_TYPE_INDEX_FACTORY;
#endif
timer = g_timer_new (); timer = g_timer_new ();
@ -743,10 +747,12 @@ gst_registry_xml_save_feature (GstRegistry * registry,
i++; i++;
} }
} }
#ifndef GST_DISABLE_INDEX
} else if (GST_IS_INDEX_FACTORY (feature)) { } else if (GST_IS_INDEX_FACTORY (feature)) {
if (!gst_registry_save_escaped (registry, " ", "longdesc", if (!gst_registry_save_escaped (registry, " ", "longdesc",
GST_INDEX_FACTORY (feature)->longdesc)) GST_INDEX_FACTORY (feature)->longdesc))
return FALSE; return FALSE;
#endif
} }
return TRUE; return TRUE;
} }

10
win32/common/config.h
View file

@ -24,7 +24,7 @@
/* #undef GST_GCOV_ENABLED */ /* #undef GST_GCOV_ENABLED */
/* Default errorlevel to use */ /* Default errorlevel to use */
#define GST_LEVEL_DEFAULT GST_LEVEL_NONE #define GST_LEVEL_DEFAULT GST_LEVEL_ERROR
/* GStreamer license */ /* GStreamer license */
#define GST_LICENSE "LGPL" #define GST_LICENSE "LGPL"
@ -33,7 +33,7 @@
#define GST_MAJORMINOR "0.10" #define GST_MAJORMINOR "0.10"
/* package name in plugins */ /* package name in plugins */
#define GST_PACKAGE_NAME "GStreamer source release" #define GST_PACKAGE_NAME "GStreamer CVS/prerelease"
/* package origin */ /* package origin */
#define GST_PACKAGE_ORIGIN "Unknown package origin" #define GST_PACKAGE_ORIGIN "Unknown package origin"
@ -197,13 +197,13 @@
#define PACKAGE_NAME "GStreamer" #define PACKAGE_NAME "GStreamer"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "GStreamer 0.10.9" #define PACKAGE_STRING "GStreamer 0.10.9.1"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gstreamer" #define PACKAGE_TARNAME "gstreamer"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "0.10.9" #define PACKAGE_VERSION "0.10.9.1"
/* Define the plugin directory */ /* Define the plugin directory */
#ifdef _DEBUG #ifdef _DEBUG
@ -219,7 +219,7 @@
#undef USE_POISONING #undef USE_POISONING
/* Version number of package */ /* Version number of package */
#define VERSION "0.10.9" #define VERSION "0.10.9.1"
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */