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

Add parsing of mod priority configuration.

Browse source
This commit is contained in:
Adam Sutton 2012-07-10 20:27:04 +01:00
parent 8ac9310505
commit a91770cebb
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/epggrab.c
View file

@ -103,6 +103,7 @@ static void* _epggrab_internal_thread ( void* p )
static void _epggrab_load ( void )
{
epggrab_module_t *mod;
htsmsg_field_t *f;
htsmsg_t *m, *a;
uint32_t enabled = 1;
const char *str;
@ -120,8 +121,10 @@ static void _epggrab_load ( void )
htsmsg_get_u32(m, "channel_rename", &epggrab_channel_rename);
htsmsg_get_u32(m, "channel_renumber", &epggrab_channel_renumber);
htsmsg_get_u32(m, "channel_reicon", &epggrab_channel_reicon);
if (!htsmsg_get_u32(m, old ? "grab-interval" : "interval", &epggrab_interval))
if (!htsmsg_get_u32(m, old ? "grab-interval" : "interval",
&epggrab_interval)) {
if (old) epggrab_interval *= 3600;
}
htsmsg_get_u32(m, "grab-enabled", &enabled);
if (enabled) {
if ( (str = htsmsg_get_str(m, old ? "current-grabber" : "module")) ) {
@ -133,16 +136,24 @@ static void _epggrab_load ( void )
if ( (a = htsmsg_get_map(m, "mod_enabled")) ) {
LIST_FOREACH(mod, &epggrab_modules, link) {
if (htsmsg_get_u32_or_default(a, mod->id, 0)) {
epggrab_enable_module(mod, 1);
epggrab_enable_module(mod, 1);
}
}
}
if ( (a = htsmsg_get_list(m, "mod_priority")) ) {
int prio = 1;
LIST_FOREACH(mod, &epggrab_modules, link)
mod->priority = 0;
HTSMSG_FOREACH(f, a) {
mod = epggrab_module_find_by_id(f->hmf_str);
if (mod) mod->priority = prio++;
}
}
}
htsmsg_destroy(m);
/* Finish up migration */
if (old) {
htsmsg_field_t *f;
htsmsg_t *xc, *ch;
htsmsg_t *xchs = hts_settings_load("xmltv/channels");
htsmsg_t *chs = hts_settings_load("channels");