From c96facc1f31d148628d8bc7fe310e6ab528e93d7 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Tue, 26 Jan 2010 15:32:08 -0800
Subject: [PATCH] fix merge glitches
---
src/plugins/gstlal_triggergen.c | 2 +-
src/plugins/gstlalcollectpads.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/gstlal_triggergen.c b/src/plugins/gstlal_triggergen.c
index be3fa91ae2..2ad3dc0b34 100644
--- a/src/plugins/gstlal_triggergen.c
+++ b/src/plugins/gstlal_triggergen.c
@@ -512,7 +512,7 @@ static GstFlowReturn gen_collected(GstCollectPads *pads, gpointer user_data)
* check for EOS
*/
- if(!GST_CLOCK_TIME_IS_VALID(earliest_input_t_start))
+ if(!GST_CLOCK_TIME_IS_VALID(earliest_input_t_start)) {
GST_DEBUG_OBJECT(element, "gstlal_collect_pads_get_earliest_times() says we are at EOS");
goto eos;
}
diff --git a/src/plugins/gstlalcollectpads.c b/src/plugins/gstlalcollectpads.c
index 37d2109091..255abb595a 100644
--- a/src/plugins/gstlalcollectpads.c
+++ b/src/plugins/gstlalcollectpads.c
@@ -304,7 +304,7 @@ gboolean gstlal_collect_pads_get_earliest_times(GstCollectPads *pads, GstClockTi
buf_t_end = compute_t_end(data, buf, rate);
gst_buffer_unref(buf);
- GST_DEBUG_OBJECT(GST_PAD_PARENT(((GstCollectData *) data)->pad), "(%s): time = [%" GST_CLOCK_TIME_FORMAT " s, %" GST_CLOCK_TIME " s)\n", GST_PAD_NAME(data->as_gstcollectdata.pad), GST_CLOCK_TIME_ARGS(buf_t_start), GST_CLOCK_TIME_ARGS(buf_t_end));
+ GST_DEBUG_OBJECT(GST_PAD_PARENT(((GstCollectData *) data)->pad), "(%s): time = [%" GST_TIME_SECONDS_FORMAT " s, %" GST_TIME_SECONDS_FORMAT " s)\n", GST_PAD_NAME(data->as_gstcollectdata.pad), GST_TIME_SECONDS_ARGS(buf_t_start), GST_TIME_SECONDS_ARGS(buf_t_end));
if(buf_t_end < buf_t_start) {
GST_LOG("%p: input buffer appears to have negative length\n", data);
@@ -334,7 +334,7 @@ gboolean gstlal_collect_pads_get_earliest_times(GstCollectPads *pads, GstClockTi
if(!valid)
*t_start = *t_end = GST_CLOCK_TIME_NONE;
- GST_DEBUG("%p: time = [%" GST_CLOCK_TIME_FORMAT " s, %" GST_CLOCK_TIME_FORMAT " s)\n", pads, GST_CLOCK_TIME_ARGS(*t_start), GST_CLOCK_TIME_ARGS(*t_end));
+ GST_DEBUG("%p: time = [%" GST_TIME_SECONDS_FORMAT " s, %" GST_TIME_SECONDS_FORMAT " s)\n", pads, GST_TIME_SECONDS_ARGS(*t_start), GST_TIME_SECONDS_ARGS(*t_end));
return TRUE;
}
@@ -418,7 +418,7 @@ GstBuffer *gstlal_collect_pads_take_buffer(GstCollectPads *pads, GstLALCollectDa
GST_BUFFER_TIMESTAMP(buf) = t_start;
GST_BUFFER_DURATION(buf) = gst_util_uint64_scale_int_round(units, GST_SECOND, rate);
- GST_DEBUG_OBJECT(GST_PAD_PARENT(data->as_gstcollectdata.pad), "(%s): returning [%" GST_CLOCK_TIME_FORMAT " s, %" GST_CLOCK_TIME_FORMAT " s)\n", GST_PAD_NAME(data->as_gstcollectdata.pad), GST_CLOCK_TIME_ARGS(GST_BUFFER_TIMESTAMP(buf)), GST_CLOCK_TIME_ARGS(GST_BUFFER_TIMESTAMP(buf) + GST_BUFFER_DURATION(buf)));
+ GST_DEBUG_OBJECT(GST_PAD_PARENT(data->as_gstcollectdata.pad), "(%s): returning [%" GST_TIME_SECONDS_FORMAT " s, %" GST_TIME_SECONDS_FORMAT " s)\n", GST_PAD_NAME(data->as_gstcollectdata.pad), GST_TIME_SECONDS_ARGS(GST_BUFFER_TIMESTAMP(buf)), GST_TIME_SECONDS_ARGS(GST_BUFFER_TIMESTAMP(buf) + GST_BUFFER_DURATION(buf)));
return buf;
}
--
GitLab