mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-26 09:50:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

Small cleanups

Browse source 
Original commit message from CVS:
Small cleanups
This commit is contained in:
Wim Taymans 2002-05-01 20:02:40 +00:00
parent befa05b4cd
commit df159cbf0d
14 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/elements/gstaggregator.c
View file

@ -125,16 +125,16 @@ gst_aggregator_class_init (GstAggregatorClass *klass)
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_PADS, 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)); 0, G_MAXINT, 0, G_PARAM_READABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SILENT, 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)); FALSE, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCHED, 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)); GST_TYPE_AGGREGATOR_SCHED, AGGREGATOR_CHAIN, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, 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)); NULL, G_PARAM_READABLE));
gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_aggregator_set_property); gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_aggregator_set_property);

8
gst/elements/gstdisksink.c
View file

@ -106,12 +106,12 @@ gst_disksink_class_init (GstDiskSinkClass *klass)
"location", ARG_LOCATION, G_PARAM_READWRITE, "location", ARG_LOCATION, G_PARAM_READWRITE,
NULL); NULL);
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MAXFILESIZE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MAXFILESIZE,
g_param_spec_int("maxfilesize","MaxFileSize","Maximum Size Per File", g_param_spec_int ("maxfilesize", "MaxFileSize", "Maximum Size Per File",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); G_MININT,G_MAXINT, 0, G_PARAM_READWRITE));
gst_disksink_signals[SIGNAL_HANDOFF] = gst_disksink_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstDiskSinkClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstDiskSinkClass, handoff), NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);

2
gst/elements/gstfakesink.c
View file

@ -111,7 +111,7 @@ gst_fakesink_class_init (GstFakeSinkClass *klass)
g_param_spec_int ("num_sinks", "Number of sinks", "The number of sinkpads", g_param_spec_int ("num_sinks", "Number of sinks", "The number of sinkpads",
1, G_MAXINT, 1, G_PARAM_READABLE)); 1, G_MAXINT, 1, G_PARAM_READABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, 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)); NULL, G_PARAM_READABLE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SYNC, g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SYNC,
g_param_spec_boolean("sync","Sync","Sync on the clock", g_param_spec_boolean("sync","Sync","Sync on the clock",

6
gst/elements/gstfakesrc.c
View file

@ -244,9 +244,9 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass)
gst_fakesrc_signals[SIGNAL_HANDOFF] = gst_fakesrc_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL,
g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fakesrc_set_property); gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fakesrc_set_property);
gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fakesrc_get_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fakesrc_get_property);

2
gst/elements/gstpipefilter.c
View file

@ -36,7 +36,7 @@
GstElementDetails gst_pipefilter_details = { GstElementDetails gst_pipefilter_details = {
"Pipefilter", "Pipefilter",
"Filter", "Filter",
"Pass data without modification", "Interoperate with an external program using stdin and stdout",
VERSION, VERSION,
"Erik Walthinsen <omega@cse.ogi.edu>\n" "Erik Walthinsen <omega@cse.ogi.edu>\n"
"Wim Taymans <wim.taymans@chello.be>", "Wim Taymans <wim.taymans@chello.be>",

11
gst/gstelement.c
View file

@ -88,7 +88,8 @@ GType gst_element_get_type (void)
(GInstanceInitFunc)gst_element_init, (GInstanceInitFunc)gst_element_init,
NULL 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; return _gst_element_type;
} }
@ -1893,13 +1894,13 @@ gst_element_populate_std_props (GObjectClass * klass,
} }
else if (prop_id == bytesperread_id) { else if (prop_id == bytesperread_id) {
pspec = g_param_spec_int ("bytesperread", "bytesperread", pspec = g_param_spec_int ("bytesperread", "Bytes per read",
"bytesperread", "Number of bytes to read per buffer",
G_MININT, G_MAXINT, 0, flags); G_MININT, G_MAXINT, 0, flags);
} }
else if (prop_id == dump_id) { 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) { else if (prop_id == filesize_id) {
@ -1927,7 +1928,7 @@ gst_element_populate_std_props (GObjectClass * klass,
} }
else if (prop_id == silent_id) { 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); FALSE, flags);
} }

3
gst/gstparse.c
View file

@ -289,14 +289,11 @@ make_connections (graph_t *g, GError **error)
} }
} else if (a) { } else if (a) {
if ((pt1 = gst_element_get_pad_template (src, (gchar*)a->data))) { 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 = gst_element_get_pad (src, (gchar*)a->data)) || pt1->presence == GST_PAD_SOMETIMES) {
if (!p1) { if (!p1) {
/* sigh, a hack until i fix the gstelement api... */ /* sigh, a hack until i fix the gstelement api... */
if ((pt2 = gst_element_get_compatible_pad_template (sink, pt1))) { 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))) { if ((p2 = gst_element_get_pad (sink, pt2->name_template))) {
/* g_print ("got the pad\n"); */
dc = g_new0 (dynamic_connection_t, 1); dc = g_new0 (dynamic_connection_t, 1);
dc->srcpadname = (gchar*)a->data; dc->srcpadname = (gchar*)a->data;
dc->target_pad = p2; dc->target_pad = p2;

1
gst/gstqueue.c
View file

@ -535,6 +535,7 @@ gst_queue_change_state (GstElement *element)
} }
else if (new_state == GST_STATE_PLAYING) { else if (new_state == GST_STATE_PLAYING) {
if (!GST_PAD_IS_CONNECTED (queue->sinkpad)) { 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? */ /* FIXME can this be? */
if (queue->reader) if (queue->reader)
g_cond_signal (queue->not_empty); g_cond_signal (queue->not_empty);

8
plugins/elements/gstaggregator.c
View file

@ -125,16 +125,16 @@ gst_aggregator_class_init (GstAggregatorClass *klass)
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_PADS, 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)); 0, G_MAXINT, 0, G_PARAM_READABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SILENT, 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)); FALSE, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCHED, 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)); GST_TYPE_AGGREGATOR_SCHED, AGGREGATOR_CHAIN, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, 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)); NULL, G_PARAM_READABLE));
gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_aggregator_set_property); gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_aggregator_set_property);

8
plugins/elements/gstdisksink.c
View file

@ -106,12 +106,12 @@ gst_disksink_class_init (GstDiskSinkClass *klass)
"location", ARG_LOCATION, G_PARAM_READWRITE, "location", ARG_LOCATION, G_PARAM_READWRITE,
NULL); NULL);
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MAXFILESIZE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MAXFILESIZE,
g_param_spec_int("maxfilesize","MaxFileSize","Maximum Size Per File", g_param_spec_int ("maxfilesize", "MaxFileSize", "Maximum Size Per File",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); G_MININT,G_MAXINT, 0, G_PARAM_READWRITE));
gst_disksink_signals[SIGNAL_HANDOFF] = gst_disksink_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstDiskSinkClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstDiskSinkClass, handoff), NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);

2
plugins/elements/gstfakesink.c
View file

@ -111,7 +111,7 @@ gst_fakesink_class_init (GstFakeSinkClass *klass)
g_param_spec_int ("num_sinks", "Number of sinks", "The number of sinkpads", g_param_spec_int ("num_sinks", "Number of sinks", "The number of sinkpads",
1, G_MAXINT, 1, G_PARAM_READABLE)); 1, G_MAXINT, 1, G_PARAM_READABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, 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)); NULL, G_PARAM_READABLE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SYNC, g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SYNC,
g_param_spec_boolean("sync","Sync","Sync on the clock", g_param_spec_boolean("sync","Sync","Sync on the clock",

6
plugins/elements/gstfakesrc.c
View file

@ -244,9 +244,9 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass)
gst_fakesrc_signals[SIGNAL_HANDOFF] = gst_fakesrc_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL,
g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fakesrc_set_property); gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fakesrc_set_property);
gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fakesrc_get_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fakesrc_get_property);

2
plugins/elements/gstpipefilter.c
View file

@ -36,7 +36,7 @@
GstElementDetails gst_pipefilter_details = { GstElementDetails gst_pipefilter_details = {
"Pipefilter", "Pipefilter",
"Filter", "Filter",
"Pass data without modification", "Interoperate with an external program using stdin and stdout",
VERSION, VERSION,
"Erik Walthinsen <omega@cse.ogi.edu>\n" "Erik Walthinsen <omega@cse.ogi.edu>\n"
"Wim Taymans <wim.taymans@chello.be>", "Wim Taymans <wim.taymans@chello.be>",

1
plugins/elements/gstqueue.c
View file

@ -535,6 +535,7 @@ gst_queue_change_state (GstElement *element)
} }
else if (new_state == GST_STATE_PLAYING) { else if (new_state == GST_STATE_PLAYING) {
if (!GST_PAD_IS_CONNECTED (queue->sinkpad)) { 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? */ /* FIXME can this be? */
if (queue->reader) if (queue->reader)
g_cond_signal (queue->not_empty); g_cond_signal (queue->not_empty);