summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-08-04 06:53:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-08-04 06:53:31 +0000
commitc4442b749a2ce59ee0c8549d8d02636d8a7e326a (patch)
tree7453f6b640d1179dafaad7354fa5ed729b1e90ef
parentdc185170e8f7fa005e92bea979ed2a2cf7d75802 (diff)
downloaddrakx-c4442b749a2ce59ee0c8549d8d02636d8a7e326a.tar
drakx-c4442b749a2ce59ee0c8549d8d02636d8a7e326a.tar.gz
drakx-c4442b749a2ce59ee0c8549d8d02636d8a7e326a.tar.bz2
drakx-c4442b749a2ce59ee0c8549d8d02636d8a7e326a.tar.xz
drakx-c4442b749a2ce59ee0c8549d8d02636d8a7e326a.zip
(config) do not set radio but for bttv driver
-rw-r--r--perl-install/harddrake/v4l.pm12
1 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index 9b331d6ee..b2f5fe5b9 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -302,8 +302,10 @@ sub config {
$conf{gbuffers} = min($max_gbuffers, $conf{gbuffers});
$conf{card} = $default if !defined $cards_list{$conf{card}};
$conf{tuner} = -1 if !defined $tuners_lst{$conf{tuner}};
- $conf{pll} = -1 if !defined $pll_lst{$conf{tuner}};
- $conf{radio} = 0 if $conf{radio} !~ /(0|1)/;
+ if ($driver eq 'bttv') {
+ $conf{pll} = -1 if !defined $pll_lst{$conf{tuner}};
+ $conf{radio} = 0 if $conf{radio} !~ /(0|1)/;
+ }
if ($in->ask_from("BTTV configuration", N("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.
@@ -319,11 +321,7 @@ If your card is misdetected, you can force the right tuner and card types here.
))
{
$conf{card} = $cards_list{$conf{card}};
-
- my $options =
- 'radio=' . ($conf{radio} ? 1 : 0) . ' ' .
- join(' ', map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers));
- if ($options) {
+ if (my $options = join(' ', if_($driver eq 'bttv', 'radio=' . ($conf{radio} ? 1 : 0)), map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers))) {
log::l(qq([harddrake::v4l] set "$options" options for $driver));
# log::explanations("modified file /etc/modules.conf ($options)") if $::isStandalone;
$modules_conf->set_options($driver, $options);