From patchwork Sat Aug 13 16:11:16 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 11973 Received: from c-24-10-6-146.hsd1.ca.comcast.net ([24.10.6.146] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.34) id 1E3yag-0004aj-2m for vdr@linuxtv.org; Sat, 13 Aug 2005 18:10:34 +0200 Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by nofear.bounceme.net (Postfix) with ESMTP id 19A967356D for ; Sat, 13 Aug 2005 09:09:56 -0700 (PDT) Message-ID: <42FE1BA4.4080205@syphir.sytes.net> Date: Sat, 13 Aug 2005 09:11:16 -0700 From: "C.Y.M" Organization: CooLNeT User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Klaus Schmidinger's VDR Subject: Re: [vdr] Centralized 'thread active' handling References: <42FDF3B7.3050302@cadsoft.de> <42FE07B1.2060504@cadsoft.de> <42FE0D6C.10209@gmx.de> <42FE0FC3.20706@cadsoft.de> <42FE148B.7080807@syphir.sytes.net> In-Reply-To: <42FE148B.7080807@syphir.sytes.net> X-Enigmail-Version: 0.92.0.0 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 16:10:34 -0000 Status: O X-Status: X-Keywords: X-UID: 4152 C.Y.M wrote: >>Now, with the naming problem settled, are there any actual, technical >>issues with this modification? >> > > > A quick compile test (using the patch in this thread) and all my plugins build > except for autotimeredit-0.1.6: > > g++ -g -O2 -Wall -Woverloaded-virtual -c -DPLUGIN_NAME_I18N='"autotimeredit"' > -D_GNU_SOURCE -I../../../include -I/usr/src/DVB/linux/include autotimeredit.c > autotimeredit.c: In member function `virtual void cPluginAutoTimer::Housekeeping()': > ../../../include/vdr/thread.h:94: error: `bool cThread::Active()' is protected > autotimeredit.c:948: error: within this context > make[1]: *** [autotimeredit.o] Error 1 > The attached patch is compile tested. Regards, diff -ruN vdr-1.3.28-eepg-orig/PLUGINS/src/autotimeredit/autotimeredit.c vdr-1.3.28-eepg/PLUGINS/src/autotimeredit/autotimeredit.c --- vdr-1.3.28-eepg-orig/PLUGINS/src/autotimeredit/autotimeredit.c 2005-04-05 10:26:10.000000000 -0700 +++ vdr-1.3.28-eepg/PLUGINS/src/autotimeredit/autotimeredit.c 2005-08-13 08:57:51.000000000 -0700 @@ -945,7 +945,7 @@ dsyslog("%s: cPluginAutoTimer::Housekeeping UpdateThread-Active=%s UpdateThread-PID=%d", plugin_name, oUpdateThread ? oUpdateThread->Active() ? "true" : "false" : "(null)", oUpdateThread ? oUpdateThread->PID() : -1); #endif if (oUpdateThread) - if (oUpdateThread->Active()) + if (oUpdateThread->Running()) { if (time(NULL) > oUpdateThread->StartTime() + 240 ) { diff -ruN vdr-1.3.28-eepg-orig/PLUGINS/src/autotimeredit/autotimers.c vdr-1.3.28-eepg/PLUGINS/src/autotimeredit/autotimers.c --- vdr-1.3.28-eepg-orig/PLUGINS/src/autotimeredit/autotimers.c 2005-04-05 01:02:06.000000000 -0700 +++ vdr-1.3.28-eepg/PLUGINS/src/autotimeredit/autotimers.c 2005-08-13 09:02:31.000000000 -0700 @@ -417,7 +417,7 @@ dsyslog("%s: cAutoTimers::RunUpdate updatemethod=%d", plugin_name, updatemethod.u); #endif char * cmd = NULL; - if (oUpdateThread && oUpdateThread->Active()) + if (oUpdateThread && oUpdateThread->Running()) { ERROR(tr("Error$search update is runing")); return false;