#!/bin/sh /usr/share/dpatch/dpatch-run

## pilot-1.3.18 patch by free-x @ vdrportal.de
##
## downloaded from http://www.vdrportal.de/board/thread.php?threadid=28335
## original file: vdr-1.3.18-pilot-0.0.7.diff
##
## fixed GetTimeString warning by Thomas Günther <tom@toms-cafe.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes for VDR >= 1.3.18.

@DPATCH@
--- pilot-0.0.7/pilotosd.c
+++ pilot-0.0.7/pilotosd.c
@@ -22,7 +22,7 @@
   osd = NULL;
   group = -1;
   number = 0;
-  lastTime = time_ms();
+  lastTime = cTimeMs::Now();
   extraInfo = false;
   offset = 0;
   lines = 0;
@@ -256,7 +256,7 @@
                  cChannel *channel = Channels.GetByNumber(number);
 	         // Display the current channel
                  DisplayChannel(channel);
-                 lastTime = time_ms();
+                 lastTime = cTimeMs::Now();
                  }
               }
 	 }
@@ -303,7 +303,7 @@
                  }
               }
            }
-           lastTime = time_ms();
+	    lastTime = cTimeMs::Now();
 	}
         break;
       case kUp|k_Repeat:
@@ -346,21 +346,21 @@
          }
       case kNone:
 	 if (extraInfo == false) {
-           if (number && time_ms() - lastTime > 1000) {
+	    if (number && (int)cTimeMs::Now() - lastTime > 1000) {
               if (Channels.GetByNumber(number)) {
                 PilotChannelNumber = number;
                 sprintf(ChanName, 
 			"%d %-16.16s", 
 			(Channels.GetByNumber(PilotChannelNumber))->Number(), 
 			(Channels.GetByNumber(PilotChannelNumber))->Name()); 
-	        lastTime = time_ms();
+		lastTime = cTimeMs::Now();
 	        number = 0;
                 cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
                 if (channel)
                   group = channel->Index()-1;
 	      } else {
                 number = 0;
-                lastTime = time_ms();
+		 lastTime = cTimeMs::Now();
                 return osContinue;
               }
               DisplayBitmap();
@@ -462,7 +462,7 @@
          return state;
     };
     if (extraInfo == false) {
-      if (time_ms() - lastTime < 5000) {
+      if ((int)cTimeMs::Now() - lastTime < 5000) {
         DisplayBitmap();
         DrawMenu(0,0);
         DisplayBitmap();
@@ -695,7 +695,7 @@
     }
     if (!isempty(titleFollowingInfo)) {
       char time[10]="";
-      sprintf(time, "> %s", Following->GetTimeString());
+      sprintf(time, "> %s", *Following->GetTimeString());
       osd->DrawText(70, 3+LINEHEIGHT, time, pal[3], pal[1],font);
       osd->DrawText(t, (3+LINEHEIGHT)*3, titleFollowingInfo, pal[3], pal[8],font);
     }