mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 20:05:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

input-selector, output-selector: minor clean-ups

Browse source
This commit is contained in:
Tim-Philipp Müller 2010-12-31 00:43:37 +00:00
parent 52617c91f3
commit fdd65e382d
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/elements/gstinputselector.c
View file

@ -1,4 +1,4 @@
/* GStreamer
/* GStreamer input selector
* Copyright (C) 2003 Julien Moutte <julien@moutte.net>
* Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* Copyright (C) 2005 Jan Schmidt <thaytan@mad.scientist.com>
@ -27,6 +27,8 @@
* @see_also: #GstOutputSelector
*
* Direct one out of N input streams to the output pad.
*
* Since: 0.10.32
*/
#ifdef HAVE_CONFIG_H
@ -57,11 +59,10 @@ enum
PROP_0,
PROP_N_PADS,
PROP_ACTIVE_PAD,
PROP_SELECT_ALL,
PROP_LAST
PROP_SELECT_ALL
};
#define DEFAULT_PAD_ALWAYS_OK TRUE
#define DEFAULT_PAD_ALWAYS_OK TRUE
enum
{
@ -69,8 +70,7 @@ enum
PROP_PAD_RUNNING_TIME,
PROP_PAD_TAGS,
PROP_PAD_ACTIVE,
PROP_PAD_ALWAYS_OK,
PROP_PAD_LAST
PROP_PAD_ALWAYS_OK
};
enum
@ -196,6 +196,7 @@ gst_selector_pad_class_init (GstSelectorPadClass * klass)
g_param_spec_boolean ("active", "Active",
"If the pad is currently active", FALSE,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/* FIXME: better property name? */
g_object_class_install_property (gobject_class, PROP_PAD_ALWAYS_OK,
g_param_spec_boolean ("always-ok", "Always OK",
"Make an inactive pad return OK instead of NOT_LINKED",
@ -780,7 +781,7 @@ gst_input_selector_base_init (gpointer g_class)
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details_simple (element_class, "Input selector",
"Generic", "N-to-1 input stream selectoring",
"Generic", "N-to-1 input stream selector",
"Julien Moutte <julien@moutte.net>, "
"Jan Schmidt <thaytan@mad.scientist.com>, "
"Wim Taymans <wim.taymans@gmail.com>");

20
plugins/elements/gstoutputselector.c
View file

@ -1,4 +1,4 @@
/* GStreamer
/* GStreamer output selector
* Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost@nokia.com>)
*
* This library is free software; you can redistribute it and/or
@ -22,6 +22,8 @@
* @see_also: #GstOutputSelector, #GstInputSelector
*
* Direct input stream to one out of N output pads.
*
* Since: 0.10.32
*/
#ifdef HAVE_CONFIG_H
@ -51,13 +53,12 @@ enum
{
PROP_0,
PROP_ACTIVE_PAD,
PROP_RESEND_LATEST,
PROP_LAST
PROP_RESEND_LATEST
};
#define _do_init(bla) \
GST_DEBUG_CATEGORY_INIT (output_selector_debug, \
"output-selector", 0, "An output stream selector element");
"output-selector", 0, "Output stream selector");
GST_BOILERPLATE_FULL (GstOutputSelector, gst_output_selector, GstElement,
GST_TYPE_ELEMENT, _do_init);
@ -85,8 +86,7 @@ gst_output_selector_base_init (gpointer g_class)
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details_simple (element_class, "Output selector",
"Generic",
"1-to-N output stream selectoring",
"Generic", "1-to-N output stream selector",
"Stefan Kost <stefan.kost@nokia.com>");
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&gst_output_selector_sink_factory));
@ -100,14 +100,10 @@ gst_output_selector_class_init (GstOutputSelectorClass * klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = gst_output_selector_dispose;
gobject_class->set_property =
GST_DEBUG_FUNCPTR (gst_output_selector_set_property);
gobject_class->get_property =
GST_DEBUG_FUNCPTR (gst_output_selector_get_property);
gobject_class->set_property = gst_output_selector_set_property;
gobject_class->get_property = gst_output_selector_get_property;
g_object_class_install_property (gobject_class, PROP_ACTIVE_PAD,
g_param_spec_object ("active-pad", "Active pad",