mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/adder/gstadder.c: Cleanup lots of empty lines that came from gst-indent going havoc before I added the INDENT_ON/...

Browse source 
Original commit message from CVS:
* gst/adder/gstadder.c:
Cleanup lots of empty lines that came from gst-indent going havoc
before I added the INDENT_ON/OFF marker some time agao.
This commit is contained in:
Stefan Kost 2008-08-01 13:06:59 +00:00
parent f7a085edaa
commit 7c2a26c9ed
2 changed files with 8 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-08-01 Stefan Kost <ensonic@users.sf.net>
* gst/adder/gstadder.c:
Cleanup lots of empty lines that came from gst-indent going havoc
before I added the INDENT_ON/OFF marker some time agao.
2008-08-01 Stefan Kost <ensonic@users.sf.net> 2008-08-01 Stefan Kost <ensonic@users.sf.net>
* configure.ac: * configure.ac:

45
gst/adder/gstadder.c
View file

@ -110,17 +110,12 @@ GST_STATIC_PAD_TEMPLATE ("sink%d",
); );
static void gst_adder_class_init (GstAdderClass * klass); static void gst_adder_class_init (GstAdderClass * klass);
static void gst_adder_init (GstAdder * adder); static void gst_adder_init (GstAdder * adder);
static void gst_adder_finalize (GObject * object); static void gst_adder_finalize (GObject * object);
static gboolean gst_adder_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_adder_setcaps (GstPad * pad, GstCaps * caps);
static gboolean gst_adder_query (GstPad * pad, GstQuery * query); static gboolean gst_adder_query (GstPad * pad, GstQuery * query);
static gboolean gst_adder_src_event (GstPad * pad, GstEvent * event); static gboolean gst_adder_src_event (GstPad * pad, GstEvent * event);
static gboolean gst_adder_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_adder_sink_event (GstPad * pad, GstEvent * event);
static GstPad *gst_adder_request_new_pad (GstElement * element, static GstPad *gst_adder_request_new_pad (GstElement * element,
@ -222,11 +217,8 @@ static gboolean
gst_adder_setcaps (GstPad * pad, GstCaps * caps) gst_adder_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstAdder *adder; GstAdder *adder;
GList *pads; GList *pads;
GstStructure *structure; GstStructure *structure;
const char *media_type; const char *media_type;
adder = GST_ADDER (GST_PAD_PARENT (pad)); adder = GST_ADDER (GST_PAD_PARENT (pad));
@ -336,13 +328,9 @@ static gboolean
gst_adder_query_duration (GstAdder * adder, GstQuery * query) gst_adder_query_duration (GstAdder * adder, GstQuery * query)
{ {
gint64 max; gint64 max;
gboolean res; gboolean res;
GstFormat format; GstFormat format;
GstIterator *it; GstIterator *it;
gboolean done; gboolean done;
/* parse format */ /* parse format */
@ -412,13 +400,9 @@ static gboolean
gst_adder_query_latency (GstAdder * adder, GstQuery * query) gst_adder_query_latency (GstAdder * adder, GstQuery * query)
{ {
GstClockTime min, max; GstClockTime min, max;
gboolean live; gboolean live;
gboolean res; gboolean res;
GstIterator *it; GstIterator *it;
gboolean done; gboolean done;
res = TRUE; res = TRUE;
@ -443,11 +427,8 @@ gst_adder_query_latency (GstAdder * adder, GstQuery * query)
case GST_ITERATOR_OK: case GST_ITERATOR_OK:
{ {
GstPad *pad = GST_PAD_CAST (item); GstPad *pad = GST_PAD_CAST (item);
GstQuery *peerquery; GstQuery *peerquery;
GstClockTime min_cur, max_cur; GstClockTime min_cur, max_cur;
gboolean live_cur; gboolean live_cur;
peerquery = gst_query_new_latency (); peerquery = gst_query_new_latency ();
@ -504,7 +485,6 @@ static gboolean
gst_adder_query (GstPad * pad, GstQuery * query) gst_adder_query (GstPad * pad, GstQuery * query)
{ {
GstAdder *adder = GST_ADDER (gst_pad_get_parent (pad)); GstAdder *adder = GST_ADDER (gst_pad_get_parent (pad));
gboolean res = FALSE; gboolean res = FALSE;
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
@ -573,7 +553,6 @@ static gboolean
forward_event (GstAdder * adder, GstEvent * event) forward_event (GstAdder * adder, GstEvent * event)
{ {
gboolean ret; gboolean ret;
GstIterator *it; GstIterator *it;
GValue vret = { 0 }; GValue vret = { 0 };
@ -599,7 +578,6 @@ static gboolean
gst_adder_src_event (GstPad * pad, GstEvent * event) gst_adder_src_event (GstPad * pad, GstEvent * event)
{ {
GstAdder *adder; GstAdder *adder;
gboolean result; gboolean result;
adder = GST_ADDER (gst_pad_get_parent (pad)); adder = GST_ADDER (gst_pad_get_parent (pad));
@ -612,9 +590,7 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
{ {
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType curtype; GstSeekType curtype;
gint64 cur; gint64 cur;
/* parse the seek parameters */ /* parse the seek parameters */
@ -630,7 +606,6 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
* when all pads received a FLUSH_STOP. */ * when all pads received a FLUSH_STOP. */
gst_pad_push_event (adder->srcpad, gst_event_new_flush_start ()); gst_pad_push_event (adder->srcpad, gst_event_new_flush_start ());
} }
/* now wait for the collected to be finished and mark a new /* now wait for the collected to be finished and mark a new
* segment */ * segment */
GST_OBJECT_LOCK (adder->collect); GST_OBJECT_LOCK (adder->collect);
@ -662,7 +637,6 @@ static gboolean
gst_adder_sink_event (GstPad * pad, GstEvent * event) gst_adder_sink_event (GstPad * pad, GstEvent * event)
{ {
GstAdder *adder; GstAdder *adder;
gboolean ret; gboolean ret;
adder = GST_ADDER (gst_pad_get_parent (pad)); adder = GST_ADDER (gst_pad_get_parent (pad));
@ -694,16 +668,11 @@ gst_adder_sink_event (GstPad * pad, GstEvent * event)
static void static void
gst_adder_class_init (GstAdderClass * klass) gst_adder_class_init (GstAdderClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class = (GObjectClass *) klass;
GstElementClass *gstelement_class = (GstElementClass *) klass;
GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass;
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_adder_finalize); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_adder_finalize);
gstelement_class = (GstElementClass *) klass;
gst_element_class_add_pad_template (gstelement_class, gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_adder_src_template)); gst_static_pad_template_get (&gst_adder_src_template));
gst_element_class_add_pad_template (gstelement_class, gst_element_class_add_pad_template (gstelement_class,
@ -841,17 +810,11 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
* - push out the output buffer * - push out the output buffer
*/ */
GstAdder *adder; GstAdder *adder;
guint size; guint size;
GSList *collected; GSList *collected;
GstBuffer *outbuf; GstBuffer *outbuf;
GstFlowReturn ret; GstFlowReturn ret;
gpointer outbytes; gpointer outbytes;
gboolean empty = TRUE; gboolean empty = TRUE;
adder = GST_ADDER (user_data); adder = GST_ADDER (user_data);
@ -874,11 +837,8 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
for (collected = pads->data; collected; collected = g_slist_next (collected)) { for (collected = pads->data; collected; collected = g_slist_next (collected)) {
GstCollectData *data; GstCollectData *data;
guint8 *bytes; guint8 *bytes;
guint len; guint len;
GstBuffer *inbuf; GstBuffer *inbuf;
data = (GstCollectData *) collected->data; data = (GstCollectData *) collected->data;
@ -1013,7 +973,6 @@ static GstStateChangeReturn
gst_adder_change_state (GstElement * element, GstStateChange transition) gst_adder_change_state (GstElement * element, GstStateChange transition)
{ {
GstAdder *adder; GstAdder *adder;
GstStateChangeReturn ret; GstStateChangeReturn ret;
adder = GST_ADDER (element); adder = GST_ADDER (element);