From 2a237f0fc468dacb1122c066d958c578a9d58a60 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Wed, 1 Mar 2006 23:01:23 +0000 Subject: [PATCH] Fix selecting TCP window size, got rid of summaries from timers --- rectimer.cc | 2 -- rectimer.h | 3 --- vdr.cc | 6 ------ voptionsmenu.cc | 2 +- vtimeredit.cc | 5 ----- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/rectimer.cc b/rectimer.cc index d6742c0..34843df 100644 --- 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 840af9b..fa53e21 100644 --- 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 84c047d..2ce5514 100644 --- 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 06c5a65..d3c0508 100644 --- a/voptionsmenu.cc +++ b/voptionsmenu.cc @@ -233,7 +233,7 @@ void VOptionsMenu::doApplyChanges(map* 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 e5e1eaf..a6929fe 100644 --- 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(); - } -- 2.39.5