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

epggrab: improve the tune callback, do tsid check for opentv

Browse source
This commit is contained in:
Jaroslav Kysela 2014-06-28 21:04:56 +02:00
parent 940da633dc
commit f794f93d63
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/epggrab.h
View file

@ -231,7 +231,8 @@ struct epggrab_module_ota
/* Transponder tuning */
void (*start) ( epggrab_module_ota_t *m, struct mpegts_mux *mm );
void (*done) ( epggrab_module_ota_t *m );
int (*tune) ( epggrab_module_ota_t *m, epggrab_ota_mux_t *om );
int (*tune) ( epggrab_module_ota_t *m, epggrab_ota_mux_t *om,
struct mpegts_mux *mm );
};
/*

5
src/epggrab/module/eit.c
View file

@ -700,7 +700,7 @@ static void _eit_start
}
static int _eit_tune
( epggrab_module_ota_t *m, epggrab_ota_mux_t *om )
( epggrab_module_ota_t *m, epggrab_ota_mux_t *om, mpegts_mux_t *mm )
{
int r = 0;
mpegts_service_t *s;
@ -708,6 +708,9 @@ static int _eit_tune
lock_assert(&global_lock);
/* Disabled */
if (!m->enabled) return 0;
/* Have gathered enough info to decide */
if (!om->om_complete)
return 1;

8
src/epggrab/module/opentv.c
View file

@ -693,8 +693,14 @@ static void _opentv_done( epggrab_module_ota_t *m )
}
static int _opentv_tune
( epggrab_module_ota_t *m, epggrab_ota_mux_t *om )
( epggrab_module_ota_t *m, epggrab_ota_mux_t *om, mpegts_mux_t *mm )
{
opentv_module_t *mod = (opentv_module_t*)m;
/* Ignore */
if (!m->enabled) return 0;
if (mod->tsid != mm->mm_tsid) return 0;
return 1;
}

3
src/epggrab/otamux.c
View file

@ -332,8 +332,7 @@ next_one:
/* Check we have modules attached and enabled */
LIST_FOREACH(map, &om->om_modules, om_link) {
if (map->om_module->enabled &&
map->om_module->tune && map->om_module->tune(map->om_module, om))
if (map->om_module->tune(map->om_module, om, mm))
break;
}
if (!map) {

3
src/epggrab/private.h
View file

@ -89,7 +89,8 @@ typedef struct epggrab_ota_module_ops {
void (*start) (epggrab_module_ota_t *m, struct mpegts_mux *mm);
int (*enable) (void *m, uint8_t e );
void (*done) (epggrab_module_ota_t*m);
int (*tune) (epggrab_module_ota_t *m, epggrab_ota_mux_t *om );
int (*tune) (epggrab_module_ota_t *m, epggrab_ota_mux_t *om,
struct mpegts_mux *mm);
} epggrab_ota_module_ops_t;
epggrab_module_ota_t *epggrab_module_ota_create