mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 04:36:20 +00:00
Re-add mixer element, gst-mixer doesn't work without it
Original commit message from CVS: Re-add mixer element, gst-mixer doesn't work without it
This commit is contained in:
parent
8468a02e24
commit
94f5506dc3
2 changed files with 26 additions and 4 deletions
|
@ -50,9 +50,14 @@ plugin_init (GstPlugin *plugin)
|
||||||
__gst_oss_plugin_dir = g_strjoinv (G_DIR_SEPARATOR_S, path);
|
__gst_oss_plugin_dir = g_strjoinv (G_DIR_SEPARATOR_S, path);
|
||||||
g_strfreev (path);
|
g_strfreev (path);
|
||||||
|
|
||||||
if (!gst_element_register (plugin, "osssrc", GST_RANK_PRIMARY, GST_TYPE_OSSSRC) ||
|
if (!gst_element_register (plugin, "ossmixer", GST_RANK_PRIMARY,
|
||||||
!gst_element_register (plugin, "osssink", GST_RANK_PRIMARY, GST_TYPE_OSSSINK) ||
|
GST_TYPE_OSSELEMENT) ||
|
||||||
!gst_element_register (plugin, "ossgst", GST_RANK_MARGINAL, GST_TYPE_OSSGST)) {
|
!gst_element_register (plugin, "osssrc", GST_RANK_PRIMARY,
|
||||||
|
GST_TYPE_OSSSRC) ||
|
||||||
|
!gst_element_register (plugin, "osssink", GST_RANK_PRIMARY,
|
||||||
|
GST_TYPE_OSSSINK) ||
|
||||||
|
!gst_element_register (plugin, "ossgst", GST_RANK_MARGINAL,
|
||||||
|
GST_TYPE_OSSGST)) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,15 @@ enum {
|
||||||
ARG_DEVICE_NAME,
|
ARG_DEVICE_NAME,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* elementfactory information */
|
||||||
|
static GstElementDetails gst_osselement_details = GST_ELEMENT_DETAILS (
|
||||||
|
"Audio Mixer (OSS)",
|
||||||
|
"Generic/Audio",
|
||||||
|
"OSS-based mixer element",
|
||||||
|
"Ronald Bultje <rbultje@ronald.bitfreak.net>"
|
||||||
|
);
|
||||||
|
|
||||||
|
static void gst_osselement_base_init (GstOssElementClass *klass);
|
||||||
static void gst_osselement_class_init (GstOssElementClass *klass);
|
static void gst_osselement_class_init (GstOssElementClass *klass);
|
||||||
static void gst_osselement_init (GstOssElement *oss);
|
static void gst_osselement_init (GstOssElement *oss);
|
||||||
static void gst_osselement_dispose (GObject *object);
|
static void gst_osselement_dispose (GObject *object);
|
||||||
|
@ -68,7 +77,7 @@ gst_osselement_get_type (void)
|
||||||
if (!osselement_type) {
|
if (!osselement_type) {
|
||||||
static const GTypeInfo osselement_info = {
|
static const GTypeInfo osselement_info = {
|
||||||
sizeof(GstOssElementClass),
|
sizeof(GstOssElementClass),
|
||||||
NULL,
|
(GBaseInitFunc)gst_osselement_base_init,
|
||||||
NULL,
|
NULL,
|
||||||
(GClassInitFunc)gst_osselement_class_init,
|
(GClassInitFunc)gst_osselement_class_init,
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -102,6 +111,14 @@ gst_osselement_get_type (void)
|
||||||
return osselement_type;
|
return osselement_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
gst_osselement_base_init (GstOssElementClass *klass)
|
||||||
|
{
|
||||||
|
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
|
||||||
|
|
||||||
|
gst_element_class_set_details (element_class, &gst_osselement_details);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_osselement_class_init (GstOssElementClass *klass)
|
gst_osselement_class_init (GstOssElementClass *klass)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue