stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/327'

Browse source
This commit is contained in:
Adam Sutton 2014-03-05 09:22:48 +00:00
commit 983c2635b9
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/input/mpegts/linuxdvb/linuxdvb_private.h
View file

@ -126,6 +126,11 @@ struct linuxdvb_satconf
gtimer_t ls_diseqc_timer;
int ls_diseqc_idx;
int ls_diseqc_repeats;
/*
* LNB settings
*/
int ls_lnb_poweroff;
/*
* Satconf elements

19
src/input/mpegts/linuxdvb/linuxdvb_satconf.c
View file

@ -193,6 +193,14 @@ const idclass_t linuxdvb_satconf_class =
.opts = PO_ADVANCED,
.def.i = 0
},
{
.type = PT_BOOL,
.id = "lnb_poweroff",
.name = "Turn off LNB when idle",
.off = offsetof(linuxdvb_satconf_t, ls_lnb_poweroff),
.opts = PO_ADVANCED,
.def.i = 1
},
{}
}
};
@ -889,6 +897,9 @@ linuxdvb_satconf_ele_stop_mux
if (ls->ls_frontend)
ls->ls_frontend->mi_stop_mux(ls->ls_frontend, mmi);
gtimer_disarm(&ls->ls_diseqc_timer);
if (ls->ls_frontend && ls->ls_lnb_poweroff)
linuxdvb_diseqc_set_volt(
((linuxdvb_frontend_t *)ls->ls_frontend)->lfe_fe_fd, -1);
}
static void linuxdvb_satconf_ele_tune_cb ( void *o );
@ -1260,12 +1271,14 @@ int
linuxdvb_diseqc_set_volt ( int fd, int vol )
{
/* Set voltage */
tvhtrace("disqec", "set voltage %dV", vol ? 18 : 13);
if (ioctl(fd, FE_SET_VOLTAGE, vol ? SEC_VOLTAGE_18 : SEC_VOLTAGE_13)) {
tvhtrace("diseqc", "set voltage %dV", vol ? (vol < 0 ? 0 : 18) : 13);
if (ioctl(fd, FE_SET_VOLTAGE,
vol ? (vol < 0 ? SEC_VOLTAGE_OFF : SEC_VOLTAGE_18) : SEC_VOLTAGE_13)) {
tvherror("diseqc", "failed to set voltage (e=%s)", strerror(errno));
return -1;
}
usleep(15000);
if (vol >= 0)
usleep(15000);
return 0;
}