From: Jaroslav Kysela Date: Fri, 15 Dec 2017 16:34:44 +0000 (+0100) Subject: epggrab: remove unused epggrab_resched() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc34a165910e741b427e0177cd7f892d6f14758f;p=thirdparty%2Ftvheadend.git epggrab: remove unused epggrab_resched() --- diff --git a/src/epggrab.c b/src/epggrab.c index ac99587b3..fb1db07bc 100644 --- a/src/epggrab.c +++ b/src/epggrab.c @@ -462,13 +462,6 @@ int epggrab_activate_module ( epggrab_module_t *mod, int a ) return save; } -/* - * TODO: implement this - */ -void epggrab_resched ( void ) -{ -} - /* * Initialise */ diff --git a/src/epggrab.h b/src/epggrab.h index d0a5e9679..768bce235 100644 --- a/src/epggrab.h +++ b/src/epggrab.h @@ -373,11 +373,6 @@ void epggrab_channel_add ( struct channel *ch ); void epggrab_channel_rem ( struct channel *ch ); void epggrab_channel_mod ( struct channel *ch ); -/* - * Re-schedule - */ -void epggrab_resched ( void ); - /* * OTA kick */ diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c index 570f513ab..d502d1626 100644 --- a/src/epggrab/module/eit.c +++ b/src/epggrab/module/eit.c @@ -505,7 +505,7 @@ static int _eit_process_event_one ( epggrab_module_t *mod, int tableid, int sect, mpegts_service_t *svc, channel_t *ch, const uint8_t *ptr, int len, - int local, int *resched, int *save ) + int local, int *save ) { eit_module_t* eit_mod = (eit_module_t*)mod; int dllen, save2 = 0, rsonly = 0; @@ -551,10 +551,8 @@ static int _eit_process_event_one } /* Mark re-schedule detect (only now/next) */ - if (!rsonly) { - if (save2 && tableid < 0x50) *resched = 1; + if (!rsonly) *save |= save2; - } /* Process tags */ memset(&ev, 0, sizeof(ev)); @@ -785,7 +783,7 @@ tidy: static int _eit_process_event ( epggrab_module_t *mod, int tableid, int sect, mpegts_service_t *svc, const uint8_t *ptr, int len, - int local, int *resched, int *save ) + int local, int *save ) { idnode_list_mapping_t *ilm; channel_t *ch; @@ -796,7 +794,7 @@ static int _eit_process_event ch = (channel_t *)ilm->ilm_in2; if (!ch->ch_enabled || ch->ch_epg_parent) continue; if (_eit_process_event_one(mod, tableid, sect, svc, ch, - ptr, len, local, resched, save) < 0) + ptr, len, local, save) < 0) return -1; } return 12 + (((ptr[10] & 0x0f) << 8) | ptr[11]); @@ -805,7 +803,7 @@ static int _eit_process_event static void _eit_process_data(void *m, void *data, uint32_t len) { - int save = 0, resched = 0; + int save = 0; eit_data_t ed; mpegts_service_t *svc; @@ -820,7 +818,7 @@ _eit_process_data(void *m, void *data, uint32_t len) while (len) { int r; if ((r = _eit_process_event(m, ed.tableid, ed.sect, svc, data, len, - ed.local_time, &resched, &save)) < 0) + ed.local_time, &save)) < 0) break; assert(r > 0); len -= r; @@ -829,7 +827,6 @@ _eit_process_data(void *m, void *data, uint32_t len) pthread_mutex_unlock(&global_lock); if (save) epg_updated(); - if (resched) epggrab_resched(); } static int