tv cards list:

	- split multi-cards entries

     - reverse the hash (needed since now bttv card types are not
       anymore unique)

	- complete the list from various sources

	- use a tree to display the list, it's clearer now since it's
       splitted by vendors

- longer message

1 files changed, 158 insertions, 124 deletions

diff --git a/perl-install/harddrake/bttv.pm b/perl-install/harddrake/bttv.pm
index d1f0f4f87..0707117e0 100644
--- a/perl-install/harddrake/bttv.pm
+++ b/perl-install/harddrake/bttv.pm
@@ -10,133 +10,166 @@ use MDK::Common;
 use modules;
 
 # please update me on bttv update :
+
+my $default = _("Auto-detect");
 my %tuners_lst = 
     (
-	-1 => _("Auto-detect"),
-	0 => "Temic PAL (4002 FH5)",
-	1 => "Philips PAL_I",
-	2 => "Philips NTSC",
-	3 => "Philips SECAM",
+	-1 => $default,
+	0 => "Temic|PAL (4002 FH5)",
+	1 => "Philips|PAL_I",
+	2 => "Philips|NTSC",
+	3 => "Philips|SECAM",
 	4 => "NoTuner",
-	5 => "Philips PAL",
-	6 => "Temic NTSC (4032 FY5)",
-	7 => "Temic PAL_I (4062 FY5)",
-	8 => "Temic NTSC (4036 FY5)",
-	9 => "Alps HSBH1",
-	10 => "Alps TSBE1",
-	11 => "Alps TSBB5",
-	12 => "Alps TSBE5",
-	13 => "Alps TSBC5",
-	14 => "Temic PAL_BG (4006FH5)",
-	15 => "Alps TSCH6",
-	16 => "Temic PAL_DK (4016 FY5)",
-	17 => "Philips NTSC_M (MK2)",
-	18 => "Temic PAL_I (4066 FY5)",
-	19 => "Temic PAL* auto (4006 FN5)",
-	20 => "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)",
-	21 => "Temic NTSC (4039 FR5)",
-	22 => "Temic PAL/SECAM multi (4046 FM5)",
-	23 => "Philips PAL_DK",
-	24 => "Philips PAL/SECAM multi (FQ1216ME)",
-	25 => "LG PAL_I+FM (TAPC-I001D)",
-	26 => "LG PAL_I (TAPC-I701D)",
-	27 => "LG NTSC+FM (TPI8NSR01F)",
-	28 => "LG PAL_BG+FM (TPI8PSB01D)",
-	29 => "LG PAL_BG (TPI8PSB11D)",
-	30 => "Temic PAL* auto + FM (4009 FN5)",
-	31 => "SHARP NTSC_JP (2U5JF5540)",
-	32 => "Samsung PAL TCPM9091PD27",
-	33 => "MT2032 universal",
-	34 => "Temic PAL_BG (4106 FH5)",
-	35 => "Temic PAL_DK/SECAM_L (4012 FY5)",
-	36 => "Temic NTSC (4136 FY5)",
-	37 => "LG PAL (newer TAPC series)",
-	38 => "Philips PAL/SECAM multi (FM1216ME)"
+	5 => "Philips|PAL",
+	6 => "Temic|NTSC (4032 FY5)",
+	7 => "Temic|PAL_I (4062 FY5)",
+	8 => "Temic|NTSC (4036 FY5)",
+	9 => "Alps|HSBH1",
+	10 => "Alps|TSBE1",
+	11 => "Alps|TSBB5",
+	12 => "Alps|TSBE5",
+	13 => "Alps|TSBC5",
+	14 => "Temic|PAL_BG (4006FH5)",
+	15 => "Alps|TSCH6",
+	16 => "Temic|PAL_DK (4016 FY5)",
+	17 => "Philips|NTSC_M (MK2)",
+	18 => "Temic|PAL_I (4066 FY5)",
+	19 => "Temic|PAL* auto (4006 FN5)",
+	20 => "Temic|PAL_BG (4009 FR5) or PAL_I (4069 FR5)",
+	21 => "Temic|NTSC (4039 FR5)",
+	22 => "Temic|PAL/SECAM multi (4046 FM5)",
+	23 => "Philips|PAL_DK",
+	24 => "Philips|PAL/SECAM multi (FQ1216ME)",
+	25 => "LG|PAL_I+FM (TAPC-I001D)",
+	26 => "LG|PAL_I (TAPC-I701D)",
+	27 => "LG|NTSC+FM (TPI8NSR01F)",
+	28 => "LG|PAL_BG+FM (TPI8PSB01D)",
+	29 => "LG|PAL_BG (TPI8PSB11D)",
+	30 => "Temic|PAL* auto + FM (4009 FN5)",
+	31 => "SHARP|NTSC_JP (2U5JF5540)",
+	32 => "Samsung|PAL TCPM9091PD27",
+	33 => "MT2032|universal",
+	34 => "Temic|PAL_BG (4106 FH5)",
+	35 => "Temic|PAL_DK/SECAM_L (4012 FY5)",
+	36 => "Temic|NTSC (4136 FY5)",
+	37 => "LG|PAL (newer TAPC series)",
+	38 => "Philips|PAL/SECAM multi (FM1216ME)"
 	);
 
+# Tweaked from Cardlist
 my %cards_lst =
     (
-	-1 => _("Auto-detect"),
-	0 => _("Unknown/Generic"),
-	1 => "MIRO PCTV",
-	2 => "Hauppauge (bt848)",
-	3 => "STB",
-	4 => "Intel Create and Share PCI/ Smart Video Recorder III",
-	5 => "Diamond DTV2000",
-	6 => "AVerMedia TVPhone",
-	7 => "MATRIX-Vision MV-Delta",
-	8 => "Lifeview FlyVideo II (Bt848) LR26",
-	9 => "IMS/IXmicro TurboTV",
-	10 => "Hauppauge (bt878)",
-	11 => "MIRO PCTV pro",
-	12 => "ADS Technologies Channel Surfer TV (bt848)",
-	13 => "AVerMedia TVCapture 98",
-	14 => "Aimslab Video Highway Xtreme (VHX)",
-	15 => "Zoltrix TV-Max",
-	16 => "Prolink Pixelview PlayTV (bt878)",
-	17 => "Leadtek WinView 601",
-	18 => "AVEC Intercapture",
-	19 => "Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)",
-	20 => "CEI Raffles Card",
-	21 => "Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50",
-	22 => "Askey CPH050/ Phoebe Tv Master + FM",
-	23 => "Modular Technology MM205 PCTV, bt878",
-	24 => "Askey CPH05X/06X (bt878) [many vendors]",
-	25 => "Terratec Terra TV+ Version 1.0 (Bt848)/Vobis TV-Boostar",
-	26 => "Hauppauge WinCam newer (bt878)",
-	27 => "Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50",
-	28 => "Terratec TerraTV+",
-	29 => "Imagenation PXC200",
-	30 => "Lifeview FlyVideo 98 LR50",
-	31 => "Formac iProTV",
-	32 => "Intel Create and Share PCI/ Smart Video Recorder III",
-	33 => "Terratec TerraTValue",
-	34 => "Leadtek WinFast 2000",
-	35 => "Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II",
-	36 => "Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner",
-	37 => "Prolink PixelView PlayTV pro",
-	38 => "Askey CPH06X TView99",
-	39 => "Pinnacle PCTV Studio/Rave",
-	40 => "STB2",
-	41 => "AVerMedia TVPhone 98",
-	42 => "ProVideo PV951",
-	43 => "Little OnAir TV",
-	44 => "Sigma TVII-FM",
-	45 => "MATRIX-Vision MV-Delta 2",
-	46 => "Zoltrix Genie TV/FM",
-	47 => "Terratec TV/Radio+",
-	48 => "Askey CPH03x/ Dynalink Magic TView",
-	49 => "IODATA GV-BCTV3/PCI",
-	50 => "Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP",
-	51 => "Eagle Wireless Capricorn2 (bt878A)",
-	52 => "Pinnacle PCTV Studio Pro",
-	53 => "Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS",
-	54 => "Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]",
-	55 => "Askey CPH031/ BESTBUY Easy TV",
-	56 => "Lifeview FlyVideo 98FM LR50",
-	57 => "GrandTec 'Grand Video Capture' (Bt848)",
-	58 => "Askey CPH060/ Phoebe TV Master Only (No FM)",
-	59 => "Askey CPH03x TV Capturer",
-	60 => "Modular Technology MM100PCTV",
-	61 => "AG Electronics GMV1",
-	62 => "Askey CPH061/ BESTBUY Easy TV (bt878)",
-	63 => "ATI TV-Wonder",
-	64 => "ATI TV-Wonder VE",
-	65 => "Lifeview FlyVideo 2000S LR90",
-	66 => "Terratec TValueRadio",
-	67 => "IODATA GV-BCTV4/PCI",
-	68 => "3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)",
-	69 => "Active Imaging AIMMS",
-	70 => "Prolink Pixelview PV-BT878P+ (Rev.4C)",
-	71 => "Lifeview FlyVideo 98EZ (capture only) LR51",
-	72 => "Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)",
-	73 => "Sensoray 311",
-	74 => "RemoteVision MX (RV605)",
-	75 => "Powercolor MTV878/ MTV878R/ MTV878F",
-	76 => "Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)",
-	77 => "GrandTec Multi Capture Card (Bt878)",
-	78 => "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF",
-	79 => "DSP Design TCVIDEO"
+	_("Auto-detect") => -1,
+	_("Unknown|Generic") => 0,
+	"M|Miro|PCTV" => 1,
+	"Hauppauge|bt848" => 2,
+	"S|STB|Hauppauge 878" => 3,
+	"I|Intel|Create and Share PCI (bttv type 4)" => 4,
+	"I|Intel|Smart Video Recorder III (bttv type 4)" => 4,
+	"D|Diamond|DTV2000" => 5,
+	"A|AVerMedia|TVPhone" => 6,
+	"M|MATRIX-Vision|MV-Delta" => 7,
+	"L|Lifeview|FlyVideo II (Bt848) LR26" => 8,
+	"I|IMS/IXmicro|TurboTV" => 9,
+	"Hauppauge|bt878" => 10,
+	"M|Miro|PCTV pro" => 11,
+	"A|ADS Technologies|Channel Surfer TV (bt848)" => 12,
+	"A|AVerMedia|TVCapture 98" => 13,
+	"A|Aimslab|Video Highway Xtreme (VHX)" => 14,
+	"Z|Zoltrix|TV-Max" => 15,
+	"P|Prolink|Pixelview PlayTV (bt878)" => 16,
+	"L|Leadtek|WinView 601" => 17,
+	"A|AVEC|Intercapture" => 18,
+	"L|Lifeview|FlyKit LR38 Bt848 (capture only)" => 19,
+	"L|Lifeview|FlyVideo II EZ" => 19,
+	"C|CEI|Raffles Card" => 20,
+	"L|Lifeview|FlyVideo 98" => 21,
+	"L|Lucky Star|Image World ConferenceTV LR50" => 21,
+	"A|Askey|CPH050" => 22,
+	"P|Phoebe Micro|Tv Master + FM" => 22,
+	"M|Modular|Technology MM205 PCTV (bt878)" => 23,
+	"A|Askey|CPH06X (bt878)" => 24,
+	"A|Askey|CPH05X (bt878)" => 24,
+	_("Unknown|CPH05X (bt878) [many vendors]") => 24,
+	_("Unknown|CPH06X (bt878) [many vendors]") => 24,
+	"T|Terratec|Terra TV+ Version 1.0 (Bt848)" => 25,
+	"Vobis|TV-Boostar" => 25,
+	"T|Terratec|TV-Boostar" => 25,
+	"Hauppauge|WinCam newer (bt878)" => 26,
+	"L|Lifeview|FlyVideo 98" => 27,
+	"G|Guillemot|MAXI TV Video PCI2 LR50" => 27,
+	"T|Terratec|TerraTV+" => 28,
+	"I|Imagenation|PXC200" => 29,
+	"L|Lifeview|FlyVideo 98 LR50" => 30,
+	"Formac|iProTV" => 31,
+	"I|Intel|Create and Share PCI (bttv type 32)" => 32,
+	"I|Intel|Smart Video Recorder III (bttv type 32)" => 32,
+	"T|Terratec|TerraTValue" => 33,
+	"L|Leadtek|WinFast 2000" => 34,
+	"L|Lifeview|FlyVideo 98 LR50" => 35,
+	"C|Chronos|Video Shuttle II" => 35,
+	"L|Lifeview|FlyVideo 98FM LR50" => 36,
+	"T|Typhoon|TView TV/FM Tuner" => 36,
+	"P|Prolink|PixelView PlayTV pro" => 37,
+	"A|Askey|CPH06X TView99" => 38,
+	"P|Pinnacle|PCTV Studio/Rave" => 39,
+	"S|STB|STB2 TV PCI FM, P/N 6000704" => 40,
+	"A|AVerMedia|TVPhone 98" => 41,
+	"P|ProVideo|PV951" => 42,
+	"L|Little|OnAir TV" => 43,
+	"S|Sigma|TVII-FM" => 44,
+	"M|MATRIX-Vision|MV-Delta 2" => 45,
+	"Z|Zoltrix|Genie TV/FM" => 46,
+	"T|Terratec|TV/Radio+" => 47,
+	"A|Askey|CPH03x" => 48,
+	"D|Dynalink|Magic TView" => 48,
+	"I|IODATA|GV-BCTV3/PCI" => 49,
+	"P|Prolink|PixelView PlayTV PAK" => 50,
+	"L|Lenco|MXTV-9578 CP" => 50,
+	"P|Prolink|PV-BT878P+4E" => 50,
+	"L|Lenco|MXTV-9578CP (Bt878)" => 50,
+	"Eagle|Wireless Capricorn2 (bt878A)" => 51,
+	"P|Pinnacle|PCTV Studio Pro" => 52,
+	"T|Typhoon|KNC1 TV Station RDS" => 53,
+	"T|Typhoon|TView RDS + FM Stereo" => 53,
+	"L|Lifeview|FlyVideo 2000" => 54,
+	"L|Lifeview|FlyVideo A2" => 54,
+	"L|Lifetec|LT 9415 TV [LR90]" => 54,
+	"A|Askey|CPH031" => 55,
+	"L|Lenco|MXR-9571 (Bt848)" => 55,
+	"Bestbuy|Easy TV" => 55,
+	"L|Lifeview|FlyVideo 98FM LR50" => 56,
+	"G|GrandTec|Grand Video Capture (Bt848)" => 57,
+	"A|Askey|CPH060" => 58,
+	"P|Phoebe Micro|TV Master Only (No FM)" => 58,
+	"A|Askey|CPH03x TV Capturer" => 59,
+	"M|Modular|Technology MM100 PCTV" => 60,
+	"A|AG|Electronics GMV1" => 61,
+	"A|Askey|CPH061" => 62,
+	"Bestbuy|Easy TV (bt878)" => 62,
+	"L|Lifetec|LT9306" => 62,
+	"M|Medion|MD9306" => 62,
+	"A|ATI|TV-Wonder" => 63,
+	"A|ATI|TV-Wonder VE" => 64,
+	"L|Lifeview|FlyVideo 2000S LR90" => 65,
+	"T|Terratec|TValueRadio" => 66,
+	"I|IODATA|GV-BCTV4/PCI" => 67,
+	"3Dfx|VoodooTV FM (Euro)" => 68,
+	"3Dfx|VoodooTV 200 (USA)" => 68,
+	"A|Active|Imaging AIMMS" => 69,
+	"P|Prolink|Pixelview PV-BT878P+ (Rev.4C)" => 70,
+	"L|Lifeview|FlyVideo 98EZ (capture only) LR51" => 71,
+	"P|Prolink|Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)" => 72,
+	"S|Sensoray|311" => 73,
+	"RemoteVision|MX (RV605)" => 74,
+	"P|Powercolor|MTV878" => 75,
+	"P|Powercolor|MTV878R" => 75,
+	"P|Powercolor|MTV878F" => 75,
+	"C|Canopus|WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)" => 76,
+	"G|GrandTec|Multi Capture Card (Bt878)" => 77,
+	"Jetway|TV/Capture JW-TV878-FBK" => 78,
+	"Kworld|KW-TV878RF" => 78,
+	"D|DSP Design|TCVIDEO" => 79
 	);
 
 my %pll_lst = 
@@ -149,13 +182,14 @@ my %pll_lst =
 
 sub config {
     my ($in) = @_;
-    my %conf = (card => -1, tuner => -1, radio => 0, pll => -1);
+    my %conf = (card => $default, tuner => -1, radio => 0, pll => -1);
 #    return unless (grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' } detect_devices::probeall(1));
-    if ($in->ask_from("BTTV configuration", _("Please,\nselect your tv card parameters if needed"),
+    if ($in->ask_from("BTTV configuration", _("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.
+If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed"),
 				  [
-				   { label => _("Card model :"), val => \$conf{card}, list => [keys %cards_lst], format => sub { $cards_lst{$_[0]} }, type => 'combo', default => -1, sort =>1},
+				   { label => _("Card model :"), val => \$conf{card}, list => [keys %cards_lst], type => 'combo', default => -1, sort =>1, separator => '|'},
 				   { label => _("PLL type :"), val => \$conf{pll}, list => [keys %pll_lst], format => sub { $pll_lst{$_[0]} }, sort => 1, default => 0, advanced =>1},
-				   { label => _("Tuner type :"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1},
+				   { label => _("Tuner type :"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|'},
 				   { label => _("Radio support :"), val => \$conf{radio}, type => "bool", text => _("enable radio support")},
 				   ]
 				  ))