diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-11-12 14:55:52 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-11-12 14:55:52 +0000 |
| commit | 30141e3ba2744ff861f809a8d7ccb91bd2680165 (patch) | |
| tree | 402b35088fb0320e0d88e0cdc63368231daab59a /perl-install/standalone/drakxtv | |
| parent | 8654b7eecff3391632803f1c835de299730a7ef6 (diff) | |
| download | drakx-backup-do-not-use-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar drakx-backup-do-not-use-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar.gz drakx-backup-do-not-use-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar.bz2 drakx-backup-do-not-use-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar.xz drakx-backup-do-not-use-30141e3ba2744ff861f809a8d7ccb91bd2680165.zip | |
handle devices managed by usbvision too
Diffstat (limited to 'perl-install/standalone/drakxtv')
| -rwxr-xr-x | perl-install/standalone/drakxtv | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index caeebcc59..0d27c7d01 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -134,11 +134,11 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); } } -my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' } detect_devices::probeall(1); +my @devices = grep { ($_->{media_type} eq 'MULTIMEDIA_VIDEO') || $_->{driver} eq 'usbvision' } detect_devices::probeall(1); if (@devices) { # TODO: That need some work for multiples TV cards foreach (@devices) { - if (($< == 0) && (grep { $_->{driver} =~ '(bttv|saa7134)' } @devices)) { + if (( $< == 0) && (grep { $_->{driver} =~ '(bttv|saa7134|usbvision)' } @devices)) { require harddrake::v4l; require modules; no strict 'subs'; @@ -147,8 +147,6 @@ if (@devices) { modules::write_conf; } scan4channels(); - $in->exit(0); - } } else { $in->ask_warn(N("No TV Card detected!"), formatAlaTeX( N("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in. @@ -159,6 +157,7 @@ You can visit our hardware database at: http://www.linux-mandrake.com/en/hardware.php3"))); } +$in->exit(0) if defined $in; # TODO: |