Debian lcd4linux und mpd (Pearl-dpf)

--- timer.c	(Revision 1144)
+++ timer.c	(Arbeitskopie)
@@ -152,16 +152,27 @@
     /* calculate time difference between the last time the timer has
        been processed and the next time it will be processed */
     int interval = Timers[timer].interval * number_of_intervals;
+    if(number_of_intervals < 0 || number_of_intervals > 3) {
+        /* convert time difference (in milliseconds) to a "timeval"
+           struct (in seconds and microseconds) */
+        struct timeval tv_interval = {
+	    .tv_sec = Timers[timer].interval / 1000,
+	    .tv_usec = (Timers[timer].interval % 1000) * 1000
+        };
 
-    /* convert time difference (in milliseconds) to a "timeval"
-       struct (in seconds and microseconds) */
-    struct timeval tv_interval = {
-	.tv_sec = interval / 1000,
-	.tv_usec = (interval % 1000) * 1000
-    };
+        /* finally, add time difference to the timer's trigger */
+        timeradd(now, &tv_interval, &Timers[timer].when);
+    } else {
+        /* convert time difference (in milliseconds) to a "timeval"
+           struct (in seconds and microseconds) */
+        struct timeval tv_interval = {
+	    .tv_sec = interval / 1000,
+	    .tv_usec = (interval % 1000) * 1000
+        };
 
-    /* finally, add time difference to the timer's trigger */
-    timeradd(&Timers[timer].when, &tv_interval, &Timers[timer].when);
+        /* finally, add time difference to the timer's trigger */
+        timeradd(&Timers[timer].when, &tv_interval, &Timers[timer].when);
+    }
 }
 
 
@@ -456,6 +467,7 @@
 	/* if there is a notable difference between "time_difference" and
 	   the next upcoming timer's interval, assume clock skew */
 	if (time_difference > (Timers[next_timer].interval + CLOCK_SKEW_DETECT_TIME_IN_MS)) {
+
 	    /* extract clock skew from "time_difference" by eliminating
 	       the timer's triggering interval */
 	    int skew = time_difference - Timers[next_timer].interval;
@@ -465,10 +477,10 @@
 
 	    /* convert clock skew from milliseconds to "timeval"
 	       structure */
-	    struct timeval clock_skew = {
-		.tv_sec = skew / 1000,
-		.tv_usec = (skew % 1000) * 1000
-	    };
+	    //struct timeval clock_skew = {
+		//.tv_sec = skew / 1000,
+		//.tv_usec = (skew % 1000) * 1000
+	    //};
 
 	    /* process all timers */
 	    for (timer = 0; timer < nTimers; timer++) {
@@ -477,9 +489,21 @@
 		    continue;
 
 		/* correct timer's time stamp by clock skew */
-		timersub(&Timers[timer].when, &clock_skew, &Timers[timer].when);
+		//timersub(&Timers[timer].when, &clock_skew, &Timers[timer].when);
+
+            /* convert time difference (in milliseconds) to a "timeval"
+               struct (in seconds and microseconds) */
+            struct timeval tv_interval = {
+	        .tv_sec = Timers[timer].interval / 1000,
+	        .tv_usec = (Timers[timer].interval % 1000) * 1000
+            };
+
+            /* finally, add time difference to the timer's trigger */
+            timeradd(&now, &tv_interval, &Timers[timer].when);
+
 	    }
 
+
 	    /* finally, zero "diff" so the next update is triggered
 	       immediately */
 	    timerclear(&diff);