diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-05 09:46:39 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-05 09:46:39 +0000 |
| commit | aa06acaf0bbb9c3ac6438ac64cf8a9ca47ada159 (patch) | |
| tree | a7a5a28a651aa20fbbe521e6d7ef22f8c9bec4bd /gst-libs/gst/gconf | |
| parent | 614c1c2c6e6cb0736de806d2ca350d3f5a2a60eb (diff) | |
| download | gst-plugins-bad-aa06acaf0bbb9c3ac6438ac64cf8a9ca47ada159.tar.gz gst-plugins-bad-aa06acaf0bbb9c3ac6438ac64cf8a9ca47ada159.tar.bz2 gst-plugins-bad-aa06acaf0bbb9c3ac6438ac64cf8a9ca47ada159.zip | |
releasing 0.6.5
Original commit message from CVS:
releasing 0.6.5
Diffstat (limited to 'gst-libs/gst/gconf')
| -rw-r--r-- | gst-libs/gst/gconf/Makefile.am | 9 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/gconf.c | 4 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/test-gconf.c | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am index faec6222..64bebf9f 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 494ca9f1..792a80c4 100644 --- a/gst-libs/gst/gconf/gconf.c +++ b/gst-libs/gst/gconf/gconf.c @@ -4,7 +4,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 */ diff --git a/gst-libs/gst/gconf/test-gconf.c b/gst-libs/gst/gconf/test-gconf.c index 5f9c398b..8c3b9c65 100644 --- a/gst-libs/gst/gconf/test-gconf.c +++ b/gst-libs/gst/gconf/test-gconf.c @@ -3,13 +3,14 @@ int main (int argc, char *argv[]) { - printf ("Default video sink : %s\n", + gst_init (&argc, &argv); + printf ("Default video sink : %s\n", gst_gconf_get_string ("default/videosink")); - printf ("Default audio sink : %s\n", + printf ("Default audio sink : %s\n", gst_gconf_get_string ("default/audiosink")); - printf ("Default video src : %s\n", + printf ("Default video src : %s\n", gst_gconf_get_string ("default/videosrc")); - printf ("Default audio src : %s\n", + printf ("Default audio src : %s\n", gst_gconf_get_string ("default/audiosrc")); return 0; } |