summaryrefslogtreecommitdiffstats
path: root/ext/gconf/gstgconfelements.c
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-01-06 16:28:30 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-01-06 16:28:30 +0000
commitcc627c9c818eed1ebac140036e4a3fe767acbe18 (patch)
tree2c180b6a6a9459caeefe654d1ee9a039902f1173 /ext/gconf/gstgconfelements.c
parentc6b9d19c3100c3600243526986f9adb205bc55e1 (diff)
ext/gconf/: Add new gconfaudiosrc and gconfvideosrc elements (needed for gnome-sound-recorder).
Original commit message from CVS: * ext/gconf/Makefile.am: * ext/gconf/gstgconfaudiosrc.c: (gst_gconf_audio_src_base_init), (gst_gconf_audio_src_class_init), (gst_gconf_audio_src_reset), (gst_gconf_audio_src_init), (gst_gconf_audio_src_dispose), (do_toggle_element), (cb_toggle_element), (gst_gconf_audio_src_change_state): * ext/gconf/gstgconfaudiosrc.h: * ext/gconf/gstgconfelements.c: (plugin_init): * ext/gconf/gstgconfvideosrc.c: (gst_gconf_video_src_base_init), (gst_gconf_video_src_class_init), (gst_gconf_video_src_reset), (gst_gconf_video_src_init), (gst_gconf_video_src_dispose), (do_toggle_element), (cb_toggle_element), (gst_gconf_video_src_change_state): * ext/gconf/gstgconfvideosrc.h: Add new gconfaudiosrc and gconfvideosrc elements (needed for gnome-sound-recorder).
Diffstat (limited to 'ext/gconf/gstgconfelements.c')
-rw-r--r--ext/gconf/gstgconfelements.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/ext/gconf/gstgconfelements.c b/ext/gconf/gstgconfelements.c
index e636278b..06f0113b 100644
--- a/ext/gconf/gstgconfelements.c
+++ b/ext/gconf/gstgconfelements.c
@@ -26,7 +26,9 @@
#include "gstgconfelements.h"
#include "gstgconfaudiosink.h"
+#include "gstgconfaudiosrc.h"
#include "gstgconfvideosink.h"
+#include "gstgconfvideosrc.h"
GST_DEBUG_CATEGORY (gconf_debug);
@@ -36,10 +38,18 @@ plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (gconf_debug, "gconf", 0,
"GConf/GStreamer audio/video output wrapper elements");
- return gst_element_register (plugin, "gconfvideosink",
- GST_RANK_NONE, GST_TYPE_GCONF_VIDEO_SINK) &&
- gst_element_register (plugin, "gconfaudiosink",
- GST_RANK_NONE, GST_TYPE_GCONF_AUDIO_SINK);
+ if (!gst_element_register (plugin, "gconfvideosink",
+ GST_RANK_NONE, GST_TYPE_GCONF_VIDEO_SINK) ||
+ !gst_element_register (plugin, "gconfvideosrc",
+ GST_RANK_NONE, GST_TYPE_GCONF_VIDEO_SRC) ||
+ !gst_element_register (plugin, "gconfaudiosink",
+ GST_RANK_NONE, GST_TYPE_GCONF_AUDIO_SINK) ||
+ !gst_element_register (plugin, "gconfaudiosrc",
+ GST_RANK_NONE, GST_TYPE_GCONF_AUDIO_SRC)) {
+ return FALSE;
+ }
+
+ return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,