diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-05-16 19:40:02 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-05-16 19:40:02 +0000 |
| commit | 47b99d430a4172ce082628bda9aba8b8db77aea0 (patch) | |
| tree | 6a8816d22b93ee33c2de7687c45d5e9deedcdd9c /lib | |
| parent | 4f46875be35c176992606c565d93e5ce97ac298b (diff) | |
| download | xxv-47b99d430a4172ce082628bda9aba8b8db77aea0.tar.gz xxv-47b99d430a4172ce082628bda9aba8b8db77aea0.tar.bz2 | |
* TIMERS: Collision ignore CA > 16
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/TIMERS.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index db917e5..e16f23b 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -1635,11 +1635,13 @@ ORDER BY # try to assign timer to dvb cards foreach my $ti (@{$timer}) { + my $CardOnly = CORE::int($ti->[fCardOnly]); + $CardOnly = 0 if($CardOnly >= 16); for my $ca (@{$CARDS}) { if(!($ti->[fCardUsed]) # If'nt assign # && $ca->{Host} eq $ti->[fHost] # Same host && $ca->{Source} eq $ti->[fSource] # Same source - && (!int($ti->[fCardOnly]) || $ca->{cardID} == int($ti->[fCardOnly])) # if CA has DVB Card number + && (!$CardOnly || $ca->{cardID} == $CardOnly) # if CA has DVB Card number && (!$ca->{tid} # Unused transponder || $ca->{tid} eq $ti->[fTID] # or same transponder || $ti->[fstart] >= $ca->{stoptime})) { # or timer ended and card are free for next timer @@ -1658,6 +1660,8 @@ ORDER BY $rerun = 0; foreach my $ti (@{$timer}) { unless($ti->[fCardUsed]) { # used card + my $CardOnly = CORE::int($ti->[fCardOnly]); + $CardOnly = 0 if($CardOnly >= 16); foreach my $co (@{$timer}) { if($ti->[fid] ne $co->[fid] && $co->[fCardUsed] # used card @@ -1668,7 +1672,7 @@ ORDER BY || (($ti->[fstop] >= $co->[fstart]) # stop >= stop && ($ti->[fstop] <= $co->[fstop])) # stop <= stop ) - && (!int($ti->[fCardOnly]) || int($ti->[fCardOnly]) == int($co->[fCardUsed])) + && (!$CardOnly || $CardOnly == $co->[fCardUsed]) ) { if($ti->[fpriority] == $co->[fpriority]) { # Same priority |