X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=time.c;h=0cb9babe2ae8de65be0fdfdc4e65ee6a626688e8;hp=1fd7b0981584fc4557079ee62a87fbd713554f3a;hb=749779fab22f802e41472a31db5a84b9b6314996;hpb=04a8d064400936dc6ecd3b137397cb2ce2cc25d7;ds=sidebyside

diff --git a/time.c b/time.c
index 1fd7b098..0cb9babe 100644
--- a/time.c
+++ b/time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -106,9 +106,10 @@ void tv_add(const struct timeval *a, const struct timeval *b,
 void tv_scale(const unsigned long mult, const struct timeval *tv,
 	struct timeval *result)
 {
-	result->tv_sec = mult * tv->tv_sec;
-	result->tv_sec += tv->tv_usec * mult / 1000 / 1000;
-	result->tv_usec = tv->tv_usec * mult % (1000 * 1000);
+	uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) * mult;
+
+	result->tv_sec = x / 1000 / 1000;
+	result->tv_usec = x % (1000 * 1000);
 }
 
 /**
@@ -170,6 +171,16 @@ int tv_convex_combination(const long a, const struct timeval *tv1,
 	return ret;
 }
 
+/**
+ * Compute when to send a chunk of an audio file.
+ *
+ * \param chunk_num The number of the chunk.
+ * \param chunk_tv The duration of one chunk.
+ * \param stream_start When the first chunk was sent.
+ * \param result The time when to send chunk number \a chunk_num.
+ *
+ * This function computes stream_start + chunk_num * chunk_time.
+ */
 void compute_chunk_time(long unsigned chunk_num,
 		struct timeval *chunk_tv, struct timeval *stream_start,
 		struct timeval *result)