summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gconf/Makefile.am8
-rw-r--r--gconf/gstreamer.schemas20
-rw-r--r--gst-libs/gst/gconf/Makefile.am9
-rw-r--r--gst-libs/gst/gconf/gconf.c4
5 files changed, 34 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 660b08a4..5407423e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-23 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ * gconf/Makefile.am:
+ * gconf/gstreamer.schemas:
+ * gst-libs/gst/gconf/Makefile.am:
+ * gst-libs/gst/gconf/gconf.c:
+ version gconf schemas and install locations
+
2004-02-23 Benjamin Otte <otte@gnome.org>
* ext/xine/xineinput.c: (gst_xine_input_dispose):
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index b3ca1fad..8fa37fbc 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -1,5 +1,8 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = gstreamer.schemas
+schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas
+
+gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
+ cp $< $@
install-data-local:
@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
@@ -10,4 +13,5 @@ install-data-local:
echo "*****************************************************";)
@true
-EXTRA_DIST = gstreamer.schemas
+CLEANFILES = $(schema_DATA)
+EXTRA_DIST = $(schema_DATA)
diff --git a/gconf/gstreamer.schemas b/gconf/gstreamer.schemas
index 699ee3e0..71cc3613 100644
--- a/gconf/gstreamer.schemas
+++ b/gconf/gstreamer.schemas
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
<schema>
- <key>/schemas/system/gstreamer/default/audiosink</key>
- <applyto>/system/gstreamer/default/audiosink</applyto>
+ <key>/schemas/system/gstreamer-0.7/default/audiosink</key>
+ <applyto>/system/gstreamer-0.7/default/audiosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>osssink</default>
@@ -12,8 +12,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer/default/videosink</key>
- <applyto>/system/gstreamer/default/videosink</applyto>
+ <key>/schemas/system/gstreamer-0.7/default/videosink</key>
+ <applyto>/system/gstreamer-0.7/default/videosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>xvideosink</default>
@@ -23,8 +23,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer/default/audiosrc</key>
- <applyto>/system/gstreamer/default/audiosrc</applyto>
+ <key>/schemas/system/gstreamer-0.7/default/audiosrc</key>
+ <applyto>/system/gstreamer-0.7/default/audiosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>osssrc</default>
@@ -34,8 +34,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer/default/videosrc</key>
- <applyto>/system/gstreamer/default/videosrc</applyto>
+ <key>/schemas/system/gstreamer-0.7/default/videosrc</key>
+ <applyto>/system/gstreamer-0.7/default/videosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>v4lsrc</default>
@@ -45,8 +45,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer/default/visualization</key>
- <applyto>/system/gstreamer/default/visualization</applyto>
+ <key>/schemas/system/gstreamer-0.7/default/visualization</key>
+ <applyto>/system/gstreamer-0.7/default/visualization</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>goom</default>
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index faec6222..b7a409ef 100644
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -9,11 +9,14 @@ libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
noinst_PROGRAMS = test-gconf
-test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
+# add define for GST_GCONF_DIR
+DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer-@GST_MAJORMINOR@\"
+
+test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
-libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) $(GST_LIBS)
-libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
+libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
+libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
EXTRA_DIST = gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in
diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index 541a086b..49511f90 100644
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -27,7 +27,9 @@
#include "gconf.h"
-#define GST_GCONF_DIR "/system/gstreamer"
+#ifndef GST_GCONF_DIR
+#error "GST_GCONF_DIR is not defined !"
+#endif
static GConfClient *_gst_gconf_client = NULL; /* GConf connection */