[vdr] Re: PATCH: vdradmin-0.24-pre6 and autopid

[Andreas Kool <akool@akool.de>]

On Sat, May 03, 2003 at 05:35:46PM +0200, Gerhard Steiner wrote:
[...]
> >There is no frequency in the unique channel id.
> >(Or i am blind ...)
>
> Schau mal in channels.c in der Funktion
> cChannel::GetChannelID
> Dort wird die Freq übergeben, wenn es keine nid gibt.

Oops :-(

Ok, next try

--- vdradmind.pl.orig	2003-05-03 16:51:13.000000000 +0200
+++ vdradmind.pl.DEBUG	2003-05-04 12:08:38.000000000 +0200
@@ -405,10 +405,22 @@
 				return($channel->{vdr_id});
 			}
 		}
+	} elsif($channel_id =~ /^(.*)-(.*)-(.*)-(.*)-(.*)$/) {
+		for my $channel (@CHAN) {
+			if($channel->{source} eq $1 &&
+			   $channel->{nid} == $2 &&
+			   ($channel->{nid} ? $channel->{tid} : $channel->{frequency}) == $3 &&
+			   $channel->{service_id} == $4 &&
+			   $channel->{rid} == $5) {
+				return($channel->{vdr_id});
+			}
+		}
 	} elsif($channel_id =~ /^(.*)-(.*)-(.*)-(.*)$/) {
 		for my $channel (@CHAN) {
-			# XXX
-			if($channel->{source} eq $1 && $channel->{service_id} == $4) {
+			if($channel->{source} eq $1 &&
+			   $channel->{nid} == $2 &&
+			   ($channel->{nid} ? $channel->{tid} : $channel->{frequency}) == $3 &&
+			   $channel->{service_id} == $4) {
 				return($channel->{vdr_id});
 			}
 		}

Ciao,
Andreas
--
Andreas Kool (akool@akool.de * akool@isdn4linux.de * http://www.akool.de)
PGP: 3FBF2411 Fingerprint: B5 35 34 74 25 60 2A 7A  89 06 92 C4 08 BA A5 BD
(To get my PGP key, send me a mail with subject "send pgp key")
		X <-- Nail here for a new Monitor
Transmission of this message via the Microsoft Network is prohibited


-- 
Info:
To unsubscribe send a mail to ecartis@linuxtv.org with "unsubscribe vdr" as subject.