17.7717.77

handle devices managed by usbvision too
author: Rémi Verschelde <rverschelde@gmail.com> 2017-04-04 20:35:12 +0200
committer: Rémi Verschelde <rverschelde@gmail.com> 2017-04-04 20:35:12 +0200
commit: 39c8e7e0e78e7aafd6883d83ccbae8057984cb9b (patch)
tree: 86463347a36ce34a7f962951634a268746acaa8c /perl-install/harddrake/data.pm
parent: 7d817b13a68e27750e84588602b39acb4c255e21 (diff)
download: drakx-17.77.tar
drakx-17.77.tar.gz
drakx-17.77.tar.bz2
drakx-17.77.tar.xz
drakx-17.77.zip
0 files changed, 0 insertions, 0 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:
author	Rémi Verschelde <rverschelde@gmail.com>	2017-04-04 20:35:12 +0200
committer	Rémi Verschelde <rverschelde@gmail.com>	2017-04-04 20:35:12 +0200
commit	39c8e7e0e78e7aafd6883d83ccbae8057984cb9b (patch)
tree	86463347a36ce34a7f962951634a268746acaa8c /perl-install/harddrake/data.pm
parent	7d817b13a68e27750e84588602b39acb4c255e21 (diff)
download	drakx-17.77.tar drakx-17.77.tar.gz drakx-17.77.tar.bz2 drakx-17.77.tar.xz drakx-17.77.zip