Skip to content

GitLab

Commit 72873243 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files
Options

Remove gconf elements and plugin 

GConf was deprecated in favour of GSettings etc.
parent 83678af5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2760 deletions
Makefile.am
View file @ 72873243
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
if USE_GCONFTOOL
GCONF_DIR = gconf
else
GCONF_DIR =
endif
ALWAYS_SUBDIRS = \
gst sys ext \
tests \
......@@ -15,14 +9,9 @@ ALWAYS_SUBDIRS = \
m4 \
pkgconfig
SUBDIRS = \
$(ALWAYS_SUBDIRS) \
$(GCONF_DIR)
DIST_SUBDIRS = \
$(ALWAYS_SUBDIRS) \
gconf
SUBDIRS = $(ALWAYS_SUBDIRS)
DIST_SUBDIRS = $(ALWAYS_SUBDIRS)
# include before EXTRA_DIST for win32 assignment
include $(top_srcdir)/common/win32.mak
......
REQUIREMENTS
View file @ 72873243
......@@ -99,12 +99,6 @@ Version: == 1.1.2
Plugins: flac (flacenc, flacdec)
URL: http://flac.sourceforge.net/
Package: GConf
Version: >= 2.0
Plugins: gconfelements (gconfvideosink, gconfvideosrc, gconfaudiosink,
gconfaudiosrc)
URL: http://www.gnome.org/
Package: HAL
Version: >= 0.5.6
Plugins: halelements (halaudiosink, halaudiosrc)
......
configure.ac
View file @ 72873243
......@@ -130,10 +130,6 @@ AG_GST_CHECK_DOWHILE_MACROS
AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
dnl check for gconftool-2
dnl this macro defines an am conditional, so it needs to be run always
AM_GCONF_SOURCE_2
dnl check for documentation tools
GTK_DOC_CHECK([1.3])
AS_PATH_PYTHON([2.1])
......@@ -266,19 +262,6 @@ fi
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
AM_CONDITIONAL(HAVE_GTK_X11, test "x$HAVE_GTK_X11" = "xyes")
dnl should we install schemas ?
translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true)
AG_GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test x$GCONFTOOL = xno; then
AC_MSG_WARN(Not installing GConf schemas)
HAVE_GCONFTOOL="no"
else
HAVE_GCONFTOOL="yes"
fi
AC_SUBST(HAVE_GCONFTOOL)
])
dnl *** set variables based on configure arguments ***
dnl set license and copyright notice
......@@ -753,12 +736,6 @@ AG_GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [
AG_GST_PKG_CHECK_MODULES(FLAC, flac >= 1.1.4)
])
dnl *** GConf ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GCONF, true)
AG_GST_CHECK_FEATURE(GCONF, [GConf libraries], gconfelements, [
AG_GST_PKG_CHECK_MODULES(GCONF, gconf-2.0)
])
dnl *** GDK pixbuf ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
AG_GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbuf, [
......@@ -1046,8 +1023,6 @@ AM_CONDITIONAL(USE_DIRECTSOUND, false)
AM_CONDITIONAL(USE_DV1394, false)
AM_CONDITIONAL(USE_ESD, false)
AM_CONDITIONAL(USE_FLAC, false)
AM_CONDITIONAL(USE_GCONF, false)
AM_CONDITIONAL(USE_GCONFTOOL, false)
AM_CONDITIONAL(USE_GDK_PIXBUF, false)
AM_CONDITIONAL(USE_GST_V4L2, false)
AM_CONDITIONAL(USE_HAL, false)
......@@ -1184,7 +1159,6 @@ ext/cairo/Makefile
ext/dv/Makefile
ext/esd/Makefile
ext/flac/Makefile
ext/gconf/Makefile
ext/gdk_pixbuf/Makefile
ext/hal/Makefile
ext/jack/Makefile
......@@ -1224,8 +1198,6 @@ tests/examples/spectrum/Makefile
tests/examples/v4l2/Makefile
tests/files/Makefile
tests/icles/Makefile
gconf/Makefile
gconf/gstreamer.schemas
common/Makefile
common/m4/Makefile
m4/Makefile
......
docs/plugins/Makefile.am
View file @ 72873243
......@@ -88,10 +88,6 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/flac/gstflacdec.h \
$(top_srcdir)/ext/flac/gstflacenc.h \
$(top_srcdir)/ext/flac/gstflactag.h \
$(top_srcdir)/ext/gconf/gstgconfaudiosrc.h \
$(top_srcdir)/ext/gconf/gstgconfaudiosink.h \
$(top_srcdir)/ext/gconf/gstgconfvideosrc.h \
$(top_srcdir)/ext/gconf/gstgconfvideosink.h \
$(top_srcdir)/ext/gdk_pixbuf/gstgdkpixbufsink.h \
$(top_srcdir)/ext/hal/gsthalaudiosink.h \
$(top_srcdir)/ext/hal/gsthalaudiosrc.h \
......
docs/plugins/gst-plugins-good-plugins-docs.sgml
View file @ 72873243
......@@ -81,10 +81,6 @@
<xi:include href="xml/element-flvmux.xml" />
<xi:include href="xml/element-flxdec.xml" />
<xi:include href="xml/element-gamma.xml" />
<xi:include href="xml/element-gconfaudiosrc.xml" />
<xi:include href="xml/element-gconfaudiosink.xml" />
<xi:include href="xml/element-gconfvideosrc.xml" />
<xi:include href="xml/element-gconfvideosink.xml" />
<xi:include href="xml/element-gdkpixbufsink.xml" />
<xi:include href="xml/element-goom.xml" />
<xi:include href="xml/element-goom2k1.xml" />
......@@ -213,7 +209,6 @@
<xi:include href="xml/plugin-flac.xml" />
<xi:include href="xml/plugin-flv.xml" />
<xi:include href="xml/plugin-flxdec.xml" />
<xi:include href="xml/plugin-gconfelements.xml" />
<xi:include href="xml/plugin-gdkpixbuf.xml" />
<xi:include href="xml/plugin-goom.xml" />
<xi:include href="xml/plugin-goom2k1.xml" />
......
docs/plugins/gst-plugins-good-plugins-sections.txt
View file @ 72873243
......@@ -927,62 +927,6 @@ GST_IS_GAMMA_CLASS
gst_gamma_get_type
</SECTION>
<SECTION>
<FILE>element-gconfaudiosrc</FILE>
<TITLE>gconfaudiosrc</TITLE>
GstGConfAudioSrc
<SUBSECTION Standard>
GstGConfAudioSrcClass
GST_GCONF_AUDIO_SRC
GST_IS_GCONF_AUDIO_SRC
GST_TYPE_GCONF_AUDIO_SRC
GST_GCONF_AUDIO_SRC_CLASS
GST_IS_GCONF_AUDIO_SRC_CLASS
gst_gconf_audio_src_get_type
</SECTION>
<SECTION>
<FILE>element-gconfaudiosink</FILE>
<TITLE>gconfaudiosink</TITLE>
GstGConfAudioSink
<SUBSECTION Standard>
GstGConfAudioSinkClass
GST_GCONF_AUDIO_SINK
GST_IS_GCONF_AUDIO_SINK
GST_TYPE_GCONF_AUDIO_SINK
GST_GCONF_AUDIO_SINK_CLASS
GST_IS_GCONF_AUDIO_SINK_CLASS
gst_gconf_audio_sink_get_type
</SECTION>
<SECTION>
<FILE>element-gconfvideosrc</FILE>
<TITLE>gconfvideosrc</TITLE>
GstGConfVideoSrc
<SUBSECTION Standard>
GstGConfVideoSrcClass
GST_GCONF_VIDEO_SRC
GST_IS_GCONF_VIDEO_SRC
GST_TYPE_GCONF_VIDEO_SRC
GST_GCONF_VIDEO_SRC_CLASS
GST_IS_GCONF_VIDEO_SRC_CLASS
gst_gconf_video_src_get_type
</SECTION>
<SECTION>
<FILE>element-gconfvideosink</FILE>
<TITLE>gconfvideosink</TITLE>
GstGConfVideoSink
<SUBSECTION Standard>
GstGConfVideoSinkClass
GST_GCONF_VIDEO_SINK
GST_IS_GCONF_VIDEO_SINK
GST_TYPE_GCONF_VIDEO_SINK
GST_GCONF_VIDEO_SINK_CLASS
GST_IS_GCONF_VIDEO_SINK_CLASS
gst_gconf_video_sink_get_type
</SECTION>
<SECTION>
<FILE>element-gdkpixbufsink</FILE>
<TITLE>gdkpixbufsink</TITLE>
......
docs/plugins/inspect/plugin-gconfelements.xml deleted 100644 → 0
View file @ 83678af5
<plugin>
<name>gconfelements</name>
<description>elements wrapping the GStreamer/GConf audio/video output settings</description>
<filename>../../ext/gconf/.libs/libgstgconfelements.so</filename>
<basename>libgstgconfelements.so</basename>
<version>0.10.29.1</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
<package>GStreamer Good Plug-ins git</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>gconfaudiosink</name>
<longname>GConf audio sink</longname>
<class>Sink/Audio</class>
<description>Audio sink embedding the GConf-settings for audio output</description>
<author>Jan Schmidt &lt;thaytan@mad.scientist.com&gt;</author>
<pads>
</pads>
</element>
<element>
<name>gconfaudiosrc</name>
<longname>GConf audio source</longname>
<class>Source/Audio</class>
<description>Audio source embedding the GConf-settings for audio input</description>
<author>GStreamer maintainers &lt;gstreamer-devel@lists.sourceforge.net&gt;</author>
<pads>
</pads>
</element>
<element>
<name>gconfvideosink</name>
<longname>GConf video sink</longname>
<class>Sink/Video</class>
<description>Video sink embedding the GConf-settings for video output</description>
<author>GStreamer maintainers &lt;gstreamer-devel@lists.sourceforge.net&gt;</author>
<pads>
</pads>
</element>
<element>
<name>gconfvideosrc</name>
<longname>GConf video source</longname>
<class>Source/Video</class>
<description>Video source embedding the GConf-settings for video input</description>
<author>GStreamer maintainers &lt;gstreamer-devel@lists.sourceforge.net&gt;</author>
<pads>
</pads>
</element>
</elements>
</plugin>
\ No newline at end of file
ext/Makefile.am
View file @ 72873243
......@@ -28,12 +28,6 @@ else
FLAC_DIR =
endif
if USE_GCONF
GCONF_DIR = gconf
else
GCONF_DIR =
endif
if USE_GDK_PIXBUF
GDK_PIXBUF_DIR = gdk_pixbuf
else
......@@ -138,7 +132,6 @@ SUBDIRS = \
$(DV1394_DIR) \
$(ESD_DIR) \
$(FLAC_DIR) \
$(GCONF_DIR) \
$(GDK_PIXBUF_DIR) \
$(HAL_DIR) \
$(JACK_DIR) \
......@@ -162,7 +155,6 @@ DIST_SUBDIRS = \
dv \
esd \
flac \
gconf \
gdk_pixbuf \
hal \
jack \
......
ext/gconf/Makefile.am deleted 100644 → 0
View file @ 83678af5
plugin_LTLIBRARIES = libgstgconfelements.la
libgstgconfelements_la_SOURCES = \
gstgconfaudiosink.c \
gstgconfaudiosrc.c \
gstgconfelements.c \
gstgconfvideosink.c \
gstgconfvideosrc.c \
gstswitchsink.c \
gstswitchsrc.c \
gstgconf.c
DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
libgstgconfelements_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
libgstgconfelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstgconfelements_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
gstgconfaudiosink.h \
gstgconfaudiosrc.h \
gstgconfelements.h \
gstgconfvideosink.h \
gstgconfvideosrc.h \
gstswitchsink.h \
gstswitchsrc.h \
gstgconf.h
ext/gconf/gstgconf.c deleted 100644 → 0
View file @ 83678af5
/* GStreamer
* nf_get_default_audio_sink
* Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) <2006> Jürg Billeter <j@bitron.ch>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* this library handles interaction with GConf
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gst/gst.h>
#include "gstgconf.h"
#include "gstgconfelements.h" /* for debug category */
#ifndef GST_GCONF_DIR
#error "GST_GCONF_DIR is not defined !"
#endif
static GConfClient *_gst_gconf_client = NULL; /* GConf connection */
/* internal functions */
static GConfClient *
gst_gconf_get_client (void)
{
if (!_gst_gconf_client)
_gst_gconf_client = gconf_client_get_default ();
return _gst_gconf_client;
}
/* external functions */
/**
* gst_gconf_get_string:
* @key: a #gchar corresponding to the key you want to get.
*
* Get GConf key @key's string value.
*
* Returns: a newly allocated #gchar string containing @key's value,
* or NULL in the case of an error..
*/
gchar *
gst_gconf_get_string (const gchar * key)
{
GError *error = NULL;
gchar *value = NULL;
gchar *full_key;
if (!g_str_has_prefix (key, GST_GCONF_DIR))
full_key = g_strdup_printf ("%s/%s", GST_GCONF_DIR, key);
else
full_key = g_strdup (key);
value = gconf_client_get_string (gst_gconf_get_client (), full_key, &error);
g_free (full_key);
if (error) {
g_warning ("gst_gconf_get_string: error: %s\n", error->message);
g_error_free (error);
return NULL;
}
return value;
}
const gchar *
gst_gconf_get_key_for_sink_profile (GstGConfProfile profile)
{
switch (profile) {
case GCONF_PROFILE_SOUNDS:
return GST_GCONF_DIR "/" GST_GCONF_AUDIOSINK_KEY;
case GCONF_PROFILE_MUSIC:
return GST_GCONF_DIR "/" GST_GCONF_MUSIC_AUDIOSINK_KEY;
case GCONF_PROFILE_CHAT:
return GST_GCONF_DIR "/" GST_GCONF_CHAT_AUDIOSINK_KEY;
default:
break;
}
g_return_val_if_reached (GST_GCONF_DIR "/" GST_GCONF_AUDIOSINK_KEY);
}
/**
* gst_gconf_set_string:
* @key: a #gchar corresponding to the key you want to set.
* @value: a #gchar containing key value.
*
* Set GConf key @key to string value @value.
*/
void
gst_gconf_set_string (const gchar * key, const gchar * value)
{
GError *error = NULL;
gchar *full_key;
if (!g_str_has_prefix (key, GST_GCONF_DIR))
full_key = g_strdup_printf ("%s/%s", GST_GCONF_DIR, key);
else
full_key = g_strdup (key);
gconf_client_set_string (gst_gconf_get_client (), full_key, value, &error);
if (error) {
GST_ERROR ("gst_gconf_set_string: error: %s\n", error->message);
g_error_free (error);
}
g_free (full_key);
}
/**
* gst_gconf_render_bin_from_key:
* @key: a #gchar string corresponding to a GConf key.
*
* Render bin from GConf key @key.
*
* Returns: a #GstElement containing the rendered bin.
*/
GstElement *
gst_gconf_render_bin_from_key (const gchar * key)
{
GstElement *bin = NULL;
gchar *value;
value = gst_gconf_get_string (key);
GST_LOG ("%s = %s", GST_STR_NULL (key), GST_STR_NULL (value));
if (value) {
GError *err = NULL;
bin = gst_parse_bin_from_description (value, TRUE, &err);
if (err) {
GST_ERROR ("gconf: error creating bin '%s': %s", value, err->message);
g_error_free (err);
}
g_free (value);
}
return bin;
}
/**
* gst_gconf_render_bin_with_default:
* @bin: a #gchar string describing the pipeline to construct.
* @default_sink: an element to use as default if the given pipeline fails to construct.
*
* Render bin from description @bin using @default_sink element as a fallback.
*
* Returns: a #GstElement containing the rendered bin.
*/
GstElement *
gst_gconf_render_bin_with_default (const gchar * bin,
const gchar * default_sink)
{
GstElement *ret = NULL;
GError *err = NULL;
if (bin != NULL)
ret = gst_parse_bin_from_description (bin, TRUE, &err);
if (ret == NULL || err != NULL) {
if (err) {
GST_DEBUG ("Could not create audio sink from GConf settings: %s",
err->message);
g_error_free (err);
} else {
GST_DEBUG ("Could not create audio sink from GConf settings");
}
ret = gst_element_factory_make (default_sink, NULL);
if (!ret)
g_warning
("Could not build GConf audio sink and the replacement %s doesn't work",
DEFAULT_AUDIOSINK);
}
return ret;
}
/**
* gst_gconf_get_default_video_sink:
*
* Render video output bin from GStreamer GConf key : "default/videosink".
* If key is invalid, the default video sink for the platform is used
* (typically xvimagesink or ximagesink).
*
* Returns: a #GstElement containing the video output bin, or NULL if
* everything failed.
*/
GstElement *
gst_gconf_get_default_video_sink (void)
{
GstElement *ret = gst_gconf_render_bin_from_key (GST_GCONF_VIDEOSINK_KEY);
if (!ret) {
ret = gst_element_factory_make (DEFAULT_VIDEOSINK, NULL);
if (!ret)
g_warning ("No GConf default video sink key and %s doesn't work",
DEFAULT_VIDEOSINK);
}
return ret;
}
/**
* gst_gconf_get_default_audio_src:
*
* Render audio acquisition bin from GStreamer GConf key : "default/audiosrc".
* If key is invalid, the default audio source for the plaform is used.
* (typically osssrc or sunaudiosrc).
*
* Returns: a #GstElement containing the audio source bin, or NULL if
* everything failed.
*/
GstElement *
gst_gconf_get_default_audio_src (void)
{
GstElement *ret = gst_gconf_render_bin_from_key (GST_GCONF_AUDIOSRC_KEY);
if (!ret) {
ret = gst_element_factory_make (DEFAULT_AUDIOSRC, NULL);
if (!ret)
g_warning ("No GConf default audio src key and %s doesn't work",
DEFAULT_AUDIOSRC);
}
return ret;
}
/**
* gst_gconf_get_default_video_src:
*
* Render video acquisition bin from GStreamer GConf key :
* "default/videosrc". If key is invalid, the default video source
* for the platform is used (typically videotestsrc).
*
* Returns: a #GstElement containing the video source bin, or NULL if
* everything failed.
*/
GstElement *
gst_gconf_get_default_video_src (void)
{
GstElement *ret = gst_gconf_render_bin_from_key (GST_GCONF_VIDEOSRC_KEY);
if (!ret) {
ret = gst_element_factory_make (DEFAULT_VIDEOSRC, NULL);
if (!ret)
g_warning ("No GConf default video src key and %s doesn't work",
DEFAULT_VIDEOSRC);
}
return ret;
}
/**
* gst_gconf_get_default_visualization_element:
*
* Render visualization bin from GStreamer GConf key : "default/visualization".
* If key is invalid, the default visualization element is used.
*
* Returns: a #GstElement containing the visualization bin, or NULL if
* everything failed.
*/
GstElement *
gst_gconf_get_default_visualization_element (void)
{
GstElement *ret = gst_gconf_render_bin_from_key ("default/visualization");
if (!ret) {
ret = gst_element_factory_make (DEFAULT_VISUALIZER, NULL);
if (!ret)
g_warning
("No GConf default visualization plugin key and %s doesn't work",
DEFAULT_VISUALIZER);
}
return ret;
}
ext/gconf/gstgconf.h deleted 100644 → 0
View file @ 83678af5
/* GStreamer
* Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) <2006> Jürg Billeter <j@bitron.ch>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*