diff options
Diffstat (limited to 'perl-install/standalone/drakxtv')
| -rwxr-xr-x | perl-install/standalone/drakxtv | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index b3f9c8802..2f1c39f4f 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -67,7 +67,7 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); "southafrica" => N("South Africa"), "argentina" => N("Argentina"), "australia-optus" => N("Australian Optus cable TV"), - -1 =>N("All") + -1 => N("All") ); # Info: HRC means "Harmonically Related Carrier" @@ -81,7 +81,7 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); "ca" => [ "canada-cable" ], "(ga|ie)" => [ "ireland" ], "it" => [ "italy" ], - "jp" => [ "japan-bcast", "NTSC-JP"], + "jp" => [ "japan-bcast", "NTSC-JP" ], "nz" => [ "newzealand" ], "(at|be|ch|de|eu|gb|se)" => [ "europe-west" ], "us" => [ "us-bcast", "NTSC" ], @@ -94,27 +94,27 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); if (/($i|$i.UTF-8)$/i) { my $tbl = $countries{$i}; $ftable_id = $tbl->[0]; - $norm = $tbl->[1] if ($tbl->[1]); + $norm = $tbl->[1] if $tbl->[1]; } } log::l("[drakxtv] guess lang=>$_, norm=>$norm, area=>$ftable_id"); if ($in->ask_from("TVdrake", N("Please,\ntype in your tv norm and country"), - [ - { label => N("TV norm:"), val => \$norm, list => ["NTSC", "NTSC-JP","PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM"], type => 'combo' }, - { label => N("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1}, + [ + { label => N("TV norm:"), val => \$norm, list => [ "NTSC", "NTSC-JP","PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM" ], type => 'combo' }, + { label => N("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1 }, ] )) { my $wait = $in->wait_message(N("Please wait"), N("Scanning for TV channels in progress ...")); # we provide scantv a bogus table (france) which will # will be ignored since "All" is selected (because of -a) - $ftable_id = "france -a " if ($ftable_id eq -1); + $ftable_id = "france -a " if $ftable_id eq -1; # Note that this'll be broken if/when we implement interactive::qt my $use_X = $in->isa('interactive::gtk') && -x "/usr/X11R6/bin/xvt"; my $home = $ENV{HOME}; my $i = system(($use_X ? "xvt -T '" . N("Scanning for TV channels") . " ...' -e " : "") . - "scantv -n $norm -f $ftable_id -o $home/.xawtv". + "scantv -n $norm -f $ftable_id -o $home/.xawtv" . ($use_X ? "" : " &>$home/tmp/scantv.log;")); if ($i) { $in->ask_warn(N("There was an error while scanning for TV channels"), @@ -122,18 +122,18 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); else { standalone::explanations("created file $home/.xawtv"); $in->ask_warn(N("Have a nice day!"), - N("Now, you can run xawtv (under X Window!) !\n")) if (! $use_X); + N("Now, you can run xawtv (under X Window!) !\n")) unless $use_X; }; }; } } -my @devices = grep { ($_->{media_type} eq 'MULTIMEDIA_VIDEO') || $_->{driver} eq 'usbvision' } 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)/ } @devices)) { require harddrake::v4l; require modules; no strict 'subs'; |