From patchwork Mon Mar 21 05:38:35 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: 11811 Received: from dialup-4.246.253.97.dial1.sanjose1.level3.net ([4.246.253.97] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.34) id 1DDFaA-0000Xh-6F for vdr@linuxtv.org; Mon, 21 Mar 2005 06:36:13 +0100 Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by nofear.bounceme.net (Postfix) with ESMTP id 5914E73571 for ; Sun, 20 Mar 2005 21:35:11 -0800 (PST) Message-ID: <423E5DDB.9030004@syphir.sytes.net> Date: Sun, 20 Mar 2005 21:38:35 -0800 From: "C.Y.M" Organization: CooLNeT User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Vdr X-Enigmail-Version: 0.90.2.0 X-Enigmail-Supports: pgp-inline, pgp-mime Subject: [vdr] epgsearch, timeline, and streamdev-client timer patches? 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: Mon, 21 Mar 2005 05:36:14 -0000 Status: O X-Status: X-Keywords: X-UID: 901 The compile for Epgsearch-0.9.1, Timeline-0.9.0, and streamdev-client have broke due to the timer changes in vdr-1.3.23. Does anyone have a solution for these? Note: I found this patch for vdradmin to support vdr-1.3.23 over on vdr portal. It did not seem to apply to my version so I re-created it. Best Regards, --- vdradmin/vdradmind.pl.orig 2005-02-04 00:43:58.000000000 -0800 +++ vdradmin/vdradmind.pl 2005-03-20 19:35:01.000000000 -0800 @@ -1256,26 +1256,24 @@ substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1); } else { # regular timer - $startsse = my_mktime(substr($start, 2, 2), - substr($start, 0, 2), $dor, (my_strftime("%m") - 1), - my_strftime("%Y")); + $dor =~ /(\d\d\d\d)-(\d\d)-(\d\d)/; + $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1); $stopsse = my_mktime(substr($stop, 2, 2), - substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, - (my_strftime("%m") - 1), my_strftime("%Y")); + substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1); } - # move timers which have expired one month into the future - if(length($dor) != 7 && $stopsse < time) { - $startsse = my_mktime(substr($start, 2, 2), - substr($start, 0, 2), $dor, (my_strftime("%m") % 12), - (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); - - $stopsse = my_mktime(substr($stop, 2, 2), - substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, - (my_strftime("%m") % 12), - (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); - } +# # move timers which have expired one month into the future +# if(length($dor) != 7 && $stopsse < time) { +# $startsse = my_mktime(substr($start, 2, 2), +# substr($start, 0, 2), $dor, (my_strftime("%m") % 12), +# (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); +# +# $stopsse = my_mktime(substr($stop, 2, 2), +# substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, +# (my_strftime("%m") % 12), +# (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); +# } if($CONFIG{RECORDINGS} && length($dor) == 7) { # repeating timer # generate repeating timer entries for up to 28 days