Fix selecting TCP window size, got rid of summaries from timers

diff --git a/rectimer.cc b/rectimer.cc
index d6742c03641516de7bb1c34bf494b2da43927fe4..34843df29ec80dbfa2e10c0e7b60ad85eaf88b17 100644 (file)
--- a/rectimer.cc
+++ b/rectimer.cc
@@ -32,7 +32,6 @@ RecTimer::RecTimer()
   stopTime = 0;
 
   file = NULL;
-  summary = NULL;
 
   index = -1;
   directory = NULL;
@@ -41,7 +40,6 @@ RecTimer::RecTimer()
 
 RecTimer::~RecTimer()
 {
-  if (summary) delete[] summary;
   if (file) delete[] file;
   if (directory) delete[] directory;
   if (name) delete[] name;

diff --git a/rectimer.h b/rectimer.h
index 840af9b6d9d72adbe41801c07e2d685ce5739c5a..fa53e210027df93712270fa201e2c586de5b0a58 100644 (file)
--- a/rectimer.h
+++ b/rectimer.h
@@ -46,8 +46,6 @@ class RecTimer
     ULONG startTime;
     ULONG stopTime;
 
-    char* summary;
-
     int index;
 
     bool operator< (const RecTimer& op2);
@@ -76,5 +74,4 @@ Lifetime
 Channel number
 Start time
 Stop time
-Summary
 */

diff --git a/vdr.cc b/vdr.cc
index 84c047d8e3472a945341ec9c21b41d3d5ba60a66..2ce5514cca1a440040008082f229094546de2229 100644 (file)
--- a/vdr.cc
+++ b/vdr.cc
@@ -547,15 +547,11 @@ int VDR::stopStreaming()
     return 0;
   }
 
-printf("sent request\n");
-
   if (!getPacket())
   {
     pthread_mutex_unlock(&mutex);
     return 0;
   }
-printf("got reply\n");
-
 
   int toReturn = (int)extractULONG();
   freePacket();
@@ -883,8 +879,6 @@ RecTimerList* VDR::getRecTimersList()
       newRecTimer->setFile(tempString);
       delete[] tempString;
 
-      newRecTimer->summary = extractString();
-
       recTimerList->push_back(newRecTimer);
       Log::getInstance()->log("VDR", Log::DEBUG, "TL: %lu %lu %lu %lu %lu %lu %lu %lu %s",
         newRecTimer->active, newRecTimer->recording, newRecTimer->pending, newRecTimer->priority, newRecTimer->lifeTime,

diff --git a/voptionsmenu.cc b/voptionsmenu.cc
index 06c5a65b81ff8cd62a0e48ea825d2dc54b333f28..d3c0508e500384ac13e5b3f30382e8412707b31d 100644 (file)
--- a/voptionsmenu.cc
+++ b/voptionsmenu.cc
@@ -233,7 +233,7 @@ void VOptionsMenu::doApplyChanges(map<int,int>* changedOptions)
         else if (i->second == 6) newTCPsize = 65536;
 
         Log::getInstance()->log("Options", Log::DEBUG, "Setting TCP window size %i", newTCPsize);
-        vdr->setReceiveWindow(newTCPsize);
+        VDR::getInstance()->setReceiveWindow(newTCPsize);
         break;
       }
     }

diff --git a/vtimeredit.cc b/vtimeredit.cc
index e5e1eafab34de3897f8017728ceaf3844778c61a..a6929fea7d4f4e718b7d564d2b790d3c979316b5 100644 (file)
--- a/vtimeredit.cc
+++ b/vtimeredit.cc
@@ -59,7 +59,6 @@ VTimerEdit::VTimerEdit(RecTimer* trt)
                                                              ypos += surface->getFontHeight();
   drawText("Current", xpos, ypos, Colour::LIGHTTEXT);        ypos += surface->getFontHeight();
   drawText("Recording", xpos, ypos, Colour::LIGHTTEXT);      ypos += surface->getFontHeight();
-  drawText("Summary", xpos, ypos, Colour::LIGHTTEXT);        ypos += surface->getFontHeight();
 
 
   // Temp
@@ -116,10 +115,6 @@ VTimerEdit::VTimerEdit(RecTimer* trt)
   else                     strcpy(buffer, "No");
   drawText(buffer, xpos, ypos, Colour::LIGHTTEXT);         ypos += surface->getFontHeight();
 
-  // Summary
-  strcpy(buffer, "View summary");
-  drawText(buffer, xpos, ypos, Colour::LIGHTTEXT);         ypos += surface->getFontHeight();
-
 
 }