summaryrefslogtreecommitdiffstats
path: root/ext/Makefile.am
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-02-24 17:20:27 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-02-24 17:20:27 +0000
commit923c2c5815886e51db850320602dc8bac2ade36f (patch)
tree76396a8066868c8bbfd2c45e850a7e9ca13f0a3c /ext/Makefile.am
parent5e49781cde9b9e97a8e2a15b3b711cb451bbc850 (diff)
downloadgst-plugins-bad-923c2c5815886e51db850320602dc8bac2ade36f.tar.gz
gst-plugins-bad-923c2c5815886e51db850320602dc8bac2ade36f.tar.bz2
gst-plugins-bad-923c2c5815886e51db850320602dc8bac2ade36f.zip
Add GConf video/audio sink handling elements. Automagically change contained element on GConf change.
Original commit message from CVS: * configure.ac: * ext/Makefile.am: * ext/gconf/Makefile.am: * ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_get_type), (gst_gconf_audio_sink_base_init), (gst_gconf_audio_sink_class_init), (gst_gconf_audio_sink_init), (gst_gconf_audio_sink_dispose), (cb_toggle_element), (gst_gconf_audio_sink_change_state): * ext/gconf/gstgconfaudiosink.h: * ext/gconf/gstgconfelements.c: (plugin_init): * ext/gconf/gstgconfelements.h: * ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_get_type), (gst_gconf_video_sink_base_init), (gst_gconf_video_sink_class_init), (gst_gconf_video_sink_init), (gst_gconf_video_sink_dispose), (cb_toggle_element), (gst_gconf_video_sink_change_state): * ext/gconf/gstgconfvideosink.h: Add GConf video/audio sink handling elements. Automagically change contained element on GConf change. * gst/autodetect/Makefile.am: * gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_get_type), (gst_auto_audio_sink_base_init), (gst_auto_audio_sink_class_init), (gst_auto_audio_sink_init), (gst_auto_audio_sink_factory_filter), (gst_auto_audio_sink_compare_ranks), (gst_auto_audio_sink_find_best), (gst_auto_audio_sink_detect): * gst/autodetect/gstautoaudiosink.h: * gst/autodetect/gstautodetect.c: (plugin_init): * gst/autodetect/gstautodetect.h: * gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_get_type), (gst_auto_video_sink_base_init), (gst_auto_video_sink_class_init), (gst_auto_video_sink_init), (gst_auto_video_sink_factory_filter), (gst_auto_video_sink_compare_ranks), (gst_auto_video_sink_find_best), (gst_auto_video_sink_detect): * gst/autodetect/gstautovideosink.h: Add video/audio output autodetection elements, based on ranks. No sound server handling in autoaudiosink yet. * ext/alsa/gstalsaplugin.c: (plugin_init): * sys/oss/gstossaudio.c: (plugin_init): Change ranks to prefer ALSA over OSS.
Diffstat (limited to 'ext/Makefile.am')
-rw-r--r--ext/Makefile.am8
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 19c8c3dc..d5a3e127 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -130,6 +130,12 @@ else
FLAC_DIR=
endif
+if USE_GCONF
+GCONF_DIR = gconf
+else
+GCONF_DIR =
+endif
+
if USE_GDK_PIXBUF
GDK_PIXBUF_DIR=gdk_pixbuf
else
@@ -418,6 +424,7 @@ SUBDIRS=\
$(FAAC_DIR) \
$(FAAD_DIR) \
$(FLAC_DIR) \
+ $(GCONF_DIR) \
$(GDK_PIXBUF_DIR) \
$(GNOMEVFS_DIR) \
$(GSM_DIR) \
@@ -483,6 +490,7 @@ DIST_SUBDIRS=\
faac \
faad \
flac \
+ gconf \
gdk_pixbuf \
gnomevfs \
gsm \