mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
Small cleanups
Original commit message from CVS: Small cleanups
This commit is contained in:
parent
befa05b4cd
commit
df159cbf0d
14 changed files with 34 additions and 34 deletions
|
@ -125,16 +125,16 @@ gst_aggregator_class_init (GstAggregatorClass *klass)
|
|||
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
||||
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_PADS,
|
||||
g_param_spec_int ("num_pads", "num_pads", "num_pads",
|
||||
g_param_spec_int ("num_pads", "Num pads", "The number of source pads",
|
||||
0, G_MAXINT, 0, G_PARAM_READABLE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SILENT,
|
||||
g_param_spec_boolean ("silent", "silent", "silent",
|
||||
g_param_spec_boolean ("silent", "Silent", "Don't produce messages",
|
||||
FALSE, G_PARAM_READWRITE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCHED,
|
||||
g_param_spec_enum ("sched", "sched", "sched",
|
||||
g_param_spec_enum ("sched", "Scheduling", "The type of scheduling this element should use",
|
||||
GST_TYPE_AGGREGATOR_SCHED, AGGREGATOR_CHAIN, G_PARAM_READWRITE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||
g_param_spec_string ("last_message", "Last message", "The current state of the element",
|
||||
NULL, G_PARAM_READABLE));
|
||||
|
||||
gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_aggregator_set_property);
|
||||
|
|
|
@ -111,7 +111,7 @@ gst_fakesink_class_init (GstFakeSinkClass *klass)
|
|||
g_param_spec_int ("num_sinks", "Number of sinks", "The number of sinkpads",
|
||||
1, G_MAXINT, 1, G_PARAM_READABLE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||
g_param_spec_string ("last_message", "Last Message", "The message describing current status",
|
||||
NULL, G_PARAM_READABLE));
|
||||
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SYNC,
|
||||
g_param_spec_boolean("sync","Sync","Sync on the clock",
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
GstElementDetails gst_pipefilter_details = {
|
||||
"Pipefilter",
|
||||
"Filter",
|
||||
"Pass data without modification",
|
||||
"Interoperate with an external program using stdin and stdout",
|
||||
VERSION,
|
||||
"Erik Walthinsen <omega@cse.ogi.edu>\n"
|
||||
"Wim Taymans <wim.taymans@chello.be>",
|
||||
|
|
|
@ -88,7 +88,8 @@ GType gst_element_get_type (void)
|
|||
(GInstanceInitFunc)gst_element_init,
|
||||
NULL
|
||||
};
|
||||
_gst_element_type = g_type_register_static(GST_TYPE_OBJECT, "GstElement", &element_info, G_TYPE_FLAG_ABSTRACT);
|
||||
_gst_element_type = g_type_register_static(GST_TYPE_OBJECT, "GstElement",
|
||||
&element_info, G_TYPE_FLAG_ABSTRACT);
|
||||
}
|
||||
return _gst_element_type;
|
||||
}
|
||||
|
@ -1893,13 +1894,13 @@ gst_element_populate_std_props (GObjectClass * klass,
|
|||
|
||||
}
|
||||
else if (prop_id == bytesperread_id) {
|
||||
pspec = g_param_spec_int ("bytesperread", "bytesperread",
|
||||
"bytesperread",
|
||||
pspec = g_param_spec_int ("bytesperread", "Bytes per read",
|
||||
"Number of bytes to read per buffer",
|
||||
G_MININT, G_MAXINT, 0, flags);
|
||||
|
||||
}
|
||||
else if (prop_id == dump_id) {
|
||||
pspec = g_param_spec_boolean ("dump", "dump", "dump", FALSE, flags);
|
||||
pspec = g_param_spec_boolean ("dump", "Dump", "Dump bytes to stdout", FALSE, flags);
|
||||
|
||||
}
|
||||
else if (prop_id == filesize_id) {
|
||||
|
@ -1927,7 +1928,7 @@ gst_element_populate_std_props (GObjectClass * klass,
|
|||
|
||||
}
|
||||
else if (prop_id == silent_id) {
|
||||
pspec = g_param_spec_boolean ("silent", "silent", "silent",
|
||||
pspec = g_param_spec_boolean ("silent", "Silent", "Don't produce events",
|
||||
FALSE, flags);
|
||||
|
||||
}
|
||||
|
|
|
@ -289,14 +289,11 @@ make_connections (graph_t *g, GError **error)
|
|||
}
|
||||
} else if (a) {
|
||||
if ((pt1 = gst_element_get_pad_template (src, (gchar*)a->data))) {
|
||||
/* g_print ("have padtemplate %s, SOMETIMES=%s\n", pt1->name_template, pt1->presence == GST_PAD_SOMETIMES ? "TRUE" : "FALSE"); */
|
||||
if ((p1 = gst_element_get_pad (src, (gchar*)a->data)) || pt1->presence == GST_PAD_SOMETIMES) {
|
||||
if (!p1) {
|
||||
/* sigh, a hack until i fix the gstelement api... */
|
||||
if ((pt2 = gst_element_get_compatible_pad_template (sink, pt1))) {
|
||||
/* g_print ("have compatible pad template %s\n", pt2->name_template); */
|
||||
if ((p2 = gst_element_get_pad (sink, pt2->name_template))) {
|
||||
/* g_print ("got the pad\n"); */
|
||||
dc = g_new0 (dynamic_connection_t, 1);
|
||||
dc->srcpadname = (gchar*)a->data;
|
||||
dc->target_pad = p2;
|
||||
|
|
|
@ -535,6 +535,7 @@ gst_queue_change_state (GstElement *element)
|
|||
}
|
||||
else if (new_state == GST_STATE_PLAYING) {
|
||||
if (!GST_PAD_IS_CONNECTED (queue->sinkpad)) {
|
||||
GST_DEBUG_ELEMENT (GST_CAT_STATES, queue, "queue %s is not connected", GST_ELEMENT_NAME (queue));
|
||||
/* FIXME can this be? */
|
||||
if (queue->reader)
|
||||
g_cond_signal (queue->not_empty);
|
||||
|
|
|
@ -125,16 +125,16 @@ gst_aggregator_class_init (GstAggregatorClass *klass)
|
|||
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
||||
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_PADS,
|
||||
g_param_spec_int ("num_pads", "num_pads", "num_pads",
|
||||
g_param_spec_int ("num_pads", "Num pads", "The number of source pads",
|
||||
0, G_MAXINT, 0, G_PARAM_READABLE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SILENT,
|
||||
g_param_spec_boolean ("silent", "silent", "silent",
|
||||
g_param_spec_boolean ("silent", "Silent", "Don't produce messages",
|
||||
FALSE, G_PARAM_READWRITE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCHED,
|
||||
g_param_spec_enum ("sched", "sched", "sched",
|
||||
g_param_spec_enum ("sched", "Scheduling", "The type of scheduling this element should use",
|
||||
GST_TYPE_AGGREGATOR_SCHED, AGGREGATOR_CHAIN, G_PARAM_READWRITE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||
g_param_spec_string ("last_message", "Last message", "The current state of the element",
|
||||
NULL, G_PARAM_READABLE));
|
||||
|
||||
gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_aggregator_set_property);
|
||||
|
|
|
@ -111,7 +111,7 @@ gst_fakesink_class_init (GstFakeSinkClass *klass)
|
|||
g_param_spec_int ("num_sinks", "Number of sinks", "The number of sinkpads",
|
||||
1, G_MAXINT, 1, G_PARAM_READABLE));
|
||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||
g_param_spec_string ("last_message", "Last Message", "The message describing current status",
|
||||
NULL, G_PARAM_READABLE));
|
||||
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SYNC,
|
||||
g_param_spec_boolean("sync","Sync","Sync on the clock",
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
GstElementDetails gst_pipefilter_details = {
|
||||
"Pipefilter",
|
||||
"Filter",
|
||||
"Pass data without modification",
|
||||
"Interoperate with an external program using stdin and stdout",
|
||||
VERSION,
|
||||
"Erik Walthinsen <omega@cse.ogi.edu>\n"
|
||||
"Wim Taymans <wim.taymans@chello.be>",
|
||||
|
|
|
@ -535,6 +535,7 @@ gst_queue_change_state (GstElement *element)
|
|||
}
|
||||
else if (new_state == GST_STATE_PLAYING) {
|
||||
if (!GST_PAD_IS_CONNECTED (queue->sinkpad)) {
|
||||
GST_DEBUG_ELEMENT (GST_CAT_STATES, queue, "queue %s is not connected", GST_ELEMENT_NAME (queue));
|
||||
/* FIXME can this be? */
|
||||
if (queue->reader)
|
||||
g_cond_signal (queue->not_empty);
|
||||
|
|
Loading…
Reference in a new issue