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

More members to dvb_network_t

Browse source
This commit is contained in:
Andreas Öman 2012-12-04 16:59:08 +01:00
parent d1051e6cc0
commit 9c2a55eb01
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dvb/dvb.h
View file

@ -175,7 +175,7 @@ typedef struct dvb_network {
struct th_dvb_mux_instance_queue dn_initial_scan_queue;
int dn_initial_num_mux;
int dn_fe_type;
th_dvb_mux_instance_t *dn_mux_epg;
} dvb_network_t;
@ -194,8 +194,6 @@ typedef struct th_dvb_adapter {
th_dvb_mux_instance_t *tda_mux_current;
char *tda_tune_reason; // Reason for last tune
th_dvb_mux_instance_t *tda_mux_epg;
int tda_table_epollfd;
const char *tda_rootpath;

15
src/dvb/dvb_adapter.c
View file

@ -733,20 +733,21 @@ dvb_adapter_mux_scanner(void *aux)
}
/* Check EPG */
if (tda->tda_mux_epg) {
epggrab_mux_stop(tda->tda_mux_epg, 1); // timeout anything not complete
tda->tda_mux_epg = NULL; // skip this time
if (tda->tda_dn->dn_mux_epg) {
// timeout anything not complete
epggrab_mux_stop(tda->tda_dn->dn_mux_epg, 1);
tda->tda_dn->dn_mux_epg = NULL; // skip this time
} else {
tda->tda_mux_epg = epggrab_mux_next(tda);
tda->tda_dn->dn_mux_epg = epggrab_mux_next(tda);
}
/* EPG */
if (tda->tda_mux_epg) {
int period = epggrab_mux_period(tda->tda_mux_epg);
if (tda->tda_dn->dn_mux_epg) {
int period = epggrab_mux_period(tda->tda_dn->dn_mux_epg);
if (period > 20)
gtimer_arm(&tda->tda_mux_scanner_timer,
dvb_adapter_mux_scanner, tda, period);
dvb_fe_tune(tda->tda_mux_epg, "EPG scan");
dvb_fe_tune(tda->tda_dn->dn_mux_epg, "EPG scan");
return;
}