[gst-cvs] thomasvs gstreamer: gstreamer/gst/ gstreamer/tools/

[Thomas V. S. <tho...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gstreamer
Changes by:     thomasvs
Date:           Wed Apr 23 2003  12:59:51 PDT

Log message:
* make the user registry location major-minor versioned so it doesn't
  clash with older incompatible registries
* make gst-register output the location of the registry it's writing

Modified files:
    gst             : Makefile.am gstregistry.h
    tools           : gst-register.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/Makefile.am.diff?r1=1.135&r2=1.136
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstregistry.h.diff?r1=1.11&r2=1.12
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tools/gst-register.c.diff?r1=1.10&r2=1.11

====Begin Diffs====
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/Makefile.am,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- Makefile.am	14 Apr 2003 18:53:40 -0000	1.135
+++ Makefile.am	23 Apr 2003 19:59:37 -0000	1.136
@@ -139,7 +139,8 @@
 libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = -D_GNU_SOURCE \
 	$(GST_CFLAGS) \
 	-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" \
+	-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" 
 libgstreamer_@GST_MAJORMINOR@_la_LIBADD = $(LIBGST_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ 
 
Index: gstregistry.h
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gstregistry.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gstregistry.h	14 Apr 2003 18:53:02 -0000	1.11
+++ gstregistry.h	23 Apr 2003 19:59:37 -0000	1.12
@@ -30,7 +30,7 @@
 #define GLOBAL_REGISTRY_FILE     GLOBAL_REGISTRY_DIR"/registry.xml"
 #define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp"
 
-#define LOCAL_REGISTRY_DIR       ".gstreamer"
+#define LOCAL_REGISTRY_DIR       ".gstreamer-"GST_MAJORMINOR
 #define LOCAL_REGISTRY_FILE      LOCAL_REGISTRY_DIR"/registry.xml"
 #define LOCAL_REGISTRY_FILE_TMP  LOCAL_REGISTRY_DIR"/.registry.xml.tmp"
 
Index: gst-register.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/tools/gst-register.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gst-register.c	8 Dec 2002 14:39:38 -0000	1.10
+++ gst-register.c	23 Apr 2003 19:59:38 -0000	1.11
@@ -81,7 +81,10 @@
 		      G_CALLBACK (plugin_added_func), NULL);
 
     if (registry->flags & GST_REGISTRY_WRITABLE) {
-      g_print ("rebuilding %s\n", registry->name);
+      char *location;
+      g_object_get (registry, "location", &location, NULL);
+      g_print ("rebuilding %s (%s)\n", registry->name, location);
+      g_free (location);
       gst_registry_rebuild (registry);
       gst_registry_save (registry);
     }