summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-03-06 14:34:49 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-03-06 14:34:49 +0000
commit06fcb64c7748b45ad228e3586b5d450c579831be (patch)
tree4003a47943e8a9886fa82142a120941cb864b590
parent5a308b9d09d0c5927e248e4fb44d94bcc2f89e61 (diff)
gst/gstclock.h: Show GST_CLOCK_TIME_NONE as 99:99:99.999999999
Original commit message from CVS: * gst/gstclock.h: Show GST_CLOCK_TIME_NONE as 99:99:99.999999999
-rw-r--r--ChangeLog5
-rw-r--r--gst/gstclock.h12
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2332cb9b9..ea7fe5aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-06 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst/gstclock.h:
+ Show GST_CLOCK_TIME_NONE as 99:99:99.999999999
+
2006-03-05 Tim-Philipp Müller <tim at centricular dot net>
* libs/gst/base/gstbasetransform.c:
diff --git a/gst/gstclock.h b/gst/gstclock.h
index b84457777..3e8b0757e 100644
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -177,10 +177,14 @@ G_STMT_START { \
* Format @t for the GST_TIME_FORMAT format string.
*/
#define GST_TIME_ARGS(t) \
- (guint) (((GstClockTime)(t)) / (GST_SECOND * 60 * 60)), \
- (guint) ((((GstClockTime)(t)) / (GST_SECOND * 60)) % 60), \
- (guint) ((((GstClockTime)(t)) / GST_SECOND) % 60), \
- (guint) (((GstClockTime)(t)) % GST_SECOND)
+ GST_CLOCK_TIME_IS_VALID (t) ? \
+ (guint) (((GstClockTime)(t)) / (GST_SECOND * 60 * 60)) : 99, \
+ GST_CLOCK_TIME_IS_VALID (t) ? \
+ (guint) ((((GstClockTime)(t)) / (GST_SECOND * 60)) % 60) : 99, \
+ GST_CLOCK_TIME_IS_VALID (t) ? \
+ (guint) ((((GstClockTime)(t)) / GST_SECOND) % 60) : 99, \
+ GST_CLOCK_TIME_IS_VALID (t) ? \
+ (guint) (((GstClockTime)(t)) % GST_SECOND) : 999999999
/**
* GST_CLOCK_ENTRY_TRACE_NAME: