epg: simplify the otamux registration

- move the timeout / interval initialization to one place - also fix values for opentv
tvheadend · Jun 27, 2014 · db3fed5 · db3fed5
1 parent 69a5a9e
commit db3fed5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
@@ -573,7 +573,7 @@ _eit_callback
 
   /* Register interest */
   if (tableid >= 0x50)
-    ota = epggrab_ota_register((epggrab_module_ota_t*)mod, mm, 3600, 240);
+    ota = epggrab_ota_register((epggrab_module_ota_t*)mod, mm);
 
   /* Begin */
   r = dvb_table_begin(mt, ptr, len, tableid, extraid, 11, &st, &sect, &last, &ver);

diff --git a/src/epggrab/module/opentv.c b/src/epggrab/module/opentv.c
@@ -504,8 +504,7 @@ opentv_bat_callback
   /* Register */
   if (!ota) {
     sta->os_ota = ota
-      = epggrab_ota_register((epggrab_module_ota_t*)mod, mt->mt_mux,
-                             1200, 3600);
+      = epggrab_ota_register((epggrab_module_ota_t*)mod, mt->mt_mux);
   }
 
   /* Complete */

diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c
@@ -191,10 +191,11 @@ epggrab_mux_stop ( mpegts_mux_t *mm, void *p )
 
 epggrab_ota_mux_t *
 epggrab_ota_register
-  ( epggrab_module_ota_t *mod, mpegts_mux_t *mm,
-    int interval, int timeout )
+  ( epggrab_module_ota_t *mod, mpegts_mux_t *mm )
 {
   int save = 0;
+  int interval = 3600;
+  int timeout  =  240;
   epggrab_ota_map_t *map;
   epggrab_ota_mux_t *ota;
 

diff --git a/src/epggrab/private.h b/src/epggrab/private.h
@@ -131,8 +131,7 @@ void epggrab_ota_destroy_by_dm     ( struct dvb_mux *dm );
  */
 
 epggrab_ota_mux_t *epggrab_ota_register   
-  ( epggrab_module_ota_t *mod, struct mpegts_mux *mux,
-    int timeout, int interval );
+  ( epggrab_module_ota_t *mod, struct mpegts_mux *mux );
 
 /*
  * State change