Portability

diff --git a/timers.cc b/timers.cc
index 26624b07fc2cfdc10941b3ff9dd4f45afa038e25..5452240da49aa5550b85361d1a68f865eab40dfc 100755 (executable)
--- a/timers.cc
+++ b/timers.cc
@@ -80,7 +80,7 @@ int Timers::shutdown()
   return 1;\r
 }\r
 \r
-int Timers::setTimer(TimerReceiver* client, int clientReference, long int requestedTime, long int requestedTimeNSEC)\r
+int Timers::setTimerT(TimerReceiver* client, int clientReference, long int requestedTime, long int requestedTimeNSEC)\r
 {\r
   if (!initted) return 0;\r
 \r
@@ -127,7 +127,7 @@ int Timers::setTimer(TimerReceiver* client, int clientReference, long int reques
   return 1;\r
 }\r
 \r
-int Timers::setTimer(TimerReceiver* client, int clientReference, struct timespec duration)\r
+int Timers::setTimerD(TimerReceiver* client, int clientReference, long int requestedSecs, long int requestedNSecs)\r
 {\r
   struct timespec currentTime;\r
   clock_gettime(CLOCK_REALTIME, &currentTime);\r
@@ -135,8 +135,8 @@ int Timers::setTimer(TimerReceiver* client, int clientReference, struct timespec
   long int requestedTime;\r
   long int requestedTimeNSEC;\r
 \r
-  requestedTime = currentTime.tv_sec + duration.tv_sec;\r
-  requestedTimeNSEC = currentTime.tv_nsec + duration.tv_nsec;\r
+  requestedTime = currentTime.tv_sec + requestedSecs;\r
+  requestedTimeNSEC = currentTime.tv_nsec + requestedNSecs;\r
   if (requestedTimeNSEC > 999999999)\r
   {\r
     ++requestedTime;\r
@@ -144,7 +144,7 @@ int Timers::setTimer(TimerReceiver* client, int clientReference, struct timespec
     logger->log("Timers", Log::DEBUG, "Second rollover - CHECK FIXME");\r
   }\r
 \r
-  return setTimer(client, clientReference, requestedTime, requestedTimeNSEC);\r
+  return setTimerT(client, clientReference, requestedTime, requestedTimeNSEC);\r
 }\r
 \r
 int Timers::cancelTimer(TimerReceiver* client, int clientReference)\r

diff --git a/timers.h b/timers.h
index 562f00c40dec3761bb2a1b55712205e117cfcba5..0aac2e7f54323b94ea6f68efa6dec362a026183e 100755 (executable)
--- a/timers.h
+++ b/timers.h
@@ -74,8 +74,8 @@ class Timers : public Thread
     int init();
     int shutdown();
 
-    int setTimer(TimerReceiver* client, int clientReference, long int requestedTime, long int requestedTimeNSEC=0);
-    int setTimer(TimerReceiver* client, int clientReference, timespec duration);
+    int setTimerT(TimerReceiver* client, int clientReference, long int requestedTime, long int requestedTimeNSEC=0);
+    int setTimerD(TimerReceiver* client, int clientReference, long int requestedSecs, long int requestedNSecs=0);
     int cancelTimer(TimerReceiver* client, int clientReference);
 
     // Thread stuff

diff --git a/vchannelselect.cc b/vchannelselect.cc
index 02ed78dc52119bc200ce322f6518275971acaaa3..8a48f05cdd8156a54a0ec8ba7812b4d9a3d71832 100644 (file)
--- a/vchannelselect.cc
+++ b/vchannelselect.cc
@@ -123,7 +123,7 @@ void VChannelSelect::draw()
     }
   }
 
-  Timers::getInstance()->setTimer(this, 1, (struct timespec){3, 0});
+  Timers::getInstance()->setTimerD(this, 1, 3);
 }
 
 int VChannelSelect::handleCommand(int command)

diff --git a/vlivebanner.cc b/vlivebanner.cc
index 703a0707d077591f99e66017ff39a63e91fce445..afb411d5fecfeaf5412c9f374c6bd8e5e3d4ec35 100644 (file)
--- a/vlivebanner.cc
+++ b/vlivebanner.cc
@@ -125,7 +125,7 @@ void VLiveBanner::setChannel(Channel* tChannel)
   }
 
   // Reset the timer as it probably took 1-2 seconds to change the channel
-  Timers::getInstance()->setTimer(this, 1, (struct timespec){4, 0});
+  Timers::getInstance()->setTimerD(this, 1, 4);
 }
 
 void VLiveBanner::draw()
@@ -165,7 +165,7 @@ int VLiveBanner::handleCommand(int command)
       ViewMan::getInstance()->updateView(this);
 
       // Arrows pressed, go to an 8s timer
-      Timers::getInstance()->setTimer(this, 1, (struct timespec){8, 0});
+      Timers::getInstance()->setTimerD(this, 1, 8);
 
       return 2;
     }
@@ -181,7 +181,7 @@ int VLiveBanner::handleCommand(int command)
       ViewMan::getInstance()->updateView(this);
 
       // Arrows pressed, go to an 8s timer
-      Timers::getInstance()->setTimer(this, 1, (struct timespec){8, 0});
+      Timers::getInstance()->setTimerD(this, 1, 8);
 
       return 2;
     }
@@ -293,5 +293,5 @@ void VLiveBanner::drawClock()
   dt += t;  // get a time_t value for it rather than using duration
   // (so it will occur at the actual second and not second and a half)
 
-  Timers::getInstance()->setTimer(this, 2, dt);
+  Timers::getInstance()->setTimerT(this, 2, dt);
 }

diff --git a/vmute.cc b/vmute.cc
index 292914a8a2579d10fd9a44b1c515620004ac1d9c..91643eaa7d613aca1f4beef8d6d112968371d7d4 100644 (file)
--- a/vmute.cc
+++ b/vmute.cc
@@ -54,7 +54,7 @@ void VMute::draw()
   w.setSurfaceOffset(5, 5);
   w.draw();
 
-  Timers::getInstance()->setTimer(this, 1, (struct timespec){2, 0});
+  Timers::getInstance()->setTimerD(this, 1, 2);
 }
 
 void VMute::timercall(int clientReference)

diff --git a/vtimerlist.cc b/vtimerlist.cc
index 69fea672e7788cc8544b44371018b333c877de6b..4d46d97e2a204b219df632d405882edf65066caf 100644 (file)
--- a/vtimerlist.cc
+++ b/vtimerlist.cc
@@ -143,7 +143,7 @@ void VTimerList::drawClock()
   strftime(timeString, 19, "%d/%m %H:%M:%S", tms);
   drawTextRJ(timeString, 560, 5, Colour::LIGHTTEXT);
 
-  Timers::getInstance()->setTimer(this, 1, t + 1);
+  Timers::getInstance()->setTimerT(this, 1, t + 1);
 }
 
 void VTimerList::drawShowing()

diff --git a/vvideorec.cc b/vvideorec.cc
index dfcd34dffb216e9cff107868d784beafc7fd5bc0..d437b3efa1f06acf997e61e0df0219998c20b206 100644 (file)
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -343,8 +343,8 @@ void VVideoRec::doBar(int action)
   drawBarClocks();
 
   ViewMan::getInstance()->updateView(this, &barRegion);
-  timers->setTimer(this, 1, (struct timespec){4, 0});
-  timers->setTimer(this, 2, (struct timespec){0, 200000000});
+  timers->setTimerD(this, 1, 4);
+  timers->setTimerD(this, 2, 0, 200000000);
 }
 
 void VVideoRec::timercall(int clientReference)
@@ -363,7 +363,7 @@ void VVideoRec::timercall(int clientReference)
       if (!barShowing) break;
       drawBarClocks();
       ViewMan::getInstance()->updateView(this, &barRegion);
-      timers->setTimer(this, 2, (struct timespec){0, 200000000});
+      timers->setTimerD(this, 2, 0, 200000000);
       break;
     }
   }

diff --git a/vvolume.cc b/vvolume.cc
index b423722f124a60b3b78a65b3e76e66bf2cc01cf0..1c509cb7e4fdbdfe2b10656f4b780307028a5616 100644 (file)
--- a/vvolume.cc
+++ b/vvolume.cc
@@ -69,7 +69,7 @@ void VVolume::draw()
     w.draw();
   }
 
-  Timers::getInstance()->setTimer(this, 1, (struct timespec){2, 0});
+  Timers::getInstance()->setTimerD(this, 1, 2);
 }
 
 void VVolume::timercall(int clientReference)

diff --git a/vwelcome.cc b/vwelcome.cc
index fb3f84910467439edf1a1c606127aa3678cad0e0..fae90fce6b9135f107bfd65937dd3ccd79ea07f1 100644 (file)
--- a/vwelcome.cc
+++ b/vwelcome.cc
@@ -106,7 +106,7 @@ void VWelcome::drawClock()
   dt += t;  // get a time_t value for it rather than using duration
   // (so it will occur at the actual second and not second and a half)
 
-  Timers::getInstance()->setTimer(this, 1, dt);
+  Timers::getInstance()->setTimerT(this, 1, dt);
 }
 
 void VWelcome::timercall(int clientReference)