From: Chris Tallon <chris@vomp.tv>
Date: Wed, 1 Mar 2006 22:29:01 +0000 (+0000)
Subject: Channel change timeout, remove timer summaries
X-Git-Tag: r0-2-5~27
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=525fa4506ff9ba87a1ba6ded2174a02f51eb8a82;p=vompserver.git

Channel change timeout, remove timer summaries
---

diff --git a/mvpclient.c b/mvpclient.c
index 4efce3c..b765a7e 100644
--- 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 8f7dfbd..ee29272 100755
--- 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;