Channel change timeout, remove timer summaries

diff --git a/mvpclient.c b/mvpclient.c
index 4efce3c39583b70153c6023a4330dbb3e9b47cc3..b765a7ed71fe652a10cc458be116c2739b359c8a 100644 (file)
--- a/mvpclient.c
+++ b/mvpclient.c
@@ -1202,7 +1202,7 @@ int MVPClient::processGetTimers(UCHAR* buffer, int length)
   UCHAR* sendBuffer = new UCHAR[50000]; // FIXME hope this is enough
   int count = 4; // leave space for the packet length
 
-  const char* string;
+  const char* fileName;
   cTimer *timer;
   int numTimers = Timers.Count();
 
@@ -1227,20 +1227,9 @@ int MVPClient::processGetTimers(UCHAR* buffer, int length)
     *(ULONG*)&sendBuffer[count] = htonl(timer->StartTime());              count += 4;
     *(ULONG*)&sendBuffer[count] = htonl(timer->StopTime());               count += 4;
 
-    string = timer->File();
-    strcpy((char*)&sendBuffer[count], string);
-    count += strlen(string) + 1;
-
-    string = timer->Summary();
-    if (string)
-    {
-      strcpy((char*)&sendBuffer[count], string);
-      count += strlen(string) + 1;
-    }
-    else
-    {
-      sendBuffer[count++] = 0;
-    }
+    fileName = timer->File();
+    strcpy((char*)&sendBuffer[count], fileName);
+    count += strlen(fileName) + 1;
   }
 
   *(ULONG*)&sendBuffer[0] = htonl(count - 4); // -4 :  take off the size field

diff --git a/mvpreceiver.c b/mvpreceiver.c
index 8f7dfbdb442f5aa60c3bfefcaa9d645ed9c94e9e..ee292727c789501deac3b4698c6a02168add76ea 100755 (executable)
--- a/mvpreceiver.c
+++ b/mvpreceiver.c
@@ -165,7 +165,7 @@ unsigned long MVPReceiver::getBlock(unsigned char* buffer, unsigned long amount)
   while ((unsigned long)processed.getContent() < amount)
   {
     pthread_mutex_unlock(&processedRingLock);
-    if (++numTries == 10) // 5s
+    if (++numTries == 30) // 15s
     {
       logger->log("MVPReceiver", Log::DEBUG, "getBlock timeout");
       return 0;