summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-24 11:27:35 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-24 11:27:35 +0000
commit864b12e7379714fc5ffa7f13a150020fead5139c (patch)
treed1aded7f277659a1bcfa58b4fceb7c564ef7e8a8
parent1548c0c7a7620d92d54533edc3c36758a23b1e0c (diff)
downloaddrakx-backup-do-not-use-864b12e7379714fc5ffa7f13a150020fead5139c.tar
drakx-backup-do-not-use-864b12e7379714fc5ffa7f13a150020fead5139c.tar.gz
drakx-backup-do-not-use-864b12e7379714fc5ffa7f13a150020fead5139c.tar.bz2
drakx-backup-do-not-use-864b12e7379714fc5ffa7f13a150020fead5139c.tar.xz
drakx-backup-do-not-use-864b12e7379714fc5ffa7f13a150020fead5139c.zip
rename isTVcard() as isTVcardConfigurable() since it's more meaninfull regarding its purpose
-rw-r--r--perl-install/detect_devices.pm2
-rwxr-xr-xperl-install/standalone/drakxtv4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 3e8836763..68dc485c2 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -449,7 +449,7 @@ sub getSoundDevices() {
modules::probe_category('multimedia/sound');
}
-sub isTVcard { member($_[0]{driver}, qw(bttv cx88 saa7134)) }
+sub isTVcardConfigurable { member($_[0]{driver}, qw(bttv cx88 saa7134)) }
sub getTVcards() { modules::probe_category('multimedia/tv') }
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 83f175237..7b8e79838 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -115,7 +115,7 @@ sub scan4channels() {
my @devices = detect_devices::getTVcards();
push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices;
-my ($devices, $devices_ok) = partition { detect_devices::isTVcard($_) } @devices;
+my ($devices, $devices_ok) = partition { detect_devices::isTVcardConfigurable($_) } @devices;
my $modules_conf;
@@ -124,7 +124,7 @@ if (@devices = @$devices) {
my $not_canceled = 1;
# TODO: That need some work for multiples TV cards
each_index {
- if (($< == 0 || $::testing) && (grep { detect_devices::isTVcard($_) } @devices)) {
+ if (($< == 0 || $::testing) && (grep { detect_devices::isTVcardConfigurable($_) } @devices)) {
require harddrake::v4l;
require modules;