psip: compilation fixes, logic fixes

diff --git a/src/epggrab/module/psip.c b/src/epggrab/module/psip.c
index 10d99313bf44e9d76ad5706f0244241c22e6a953..69ca23a6bedcd0adfb5811752d4cf3ffed66a19f 100644 (file)
--- a/src/epggrab/module/psip.c
+++ b/src/epggrab/module/psip.c
@@ -36,7 +36,7 @@ typedef struct psip_event
 {
   char              uri[257];
   char              suri[257];
-  
+
   lang_str_t       *title;
   lang_str_t       *summary;
   lang_str_t       *desc;
@@ -85,6 +85,7 @@ _psip_eit_callback
   epggrab_ota_mux_t    *ota = NULL;
   mpegts_service_t     *svc;
   mpegts_psi_table_state_t *st;
+  char ubuf[UUID_HEX_SIZE];
 
   /* Validate */
   if (tableid != 0xcb) return -1;
@@ -121,7 +122,7 @@ _psip_eit_callback
 
   /* Register this */
   if (ota)
-    epggrab_ota_service_add(map, ota, idnode_uuid_as_str(&svc->s_id), 1);
+    epggrab_ota_service_add(map, ota, idnode_uuid_as_str(&svc->s_id, ubuf), 1);
 
   /* No point processing */
   if (!LIST_FIRST(&svc->s_channels))
@@ -271,19 +272,6 @@ static int
 _psip_mgt_callback
   (mpegts_table_t *mt, const uint8_t *ptr, int len, int tableid)
 {
-#if 0
-  int r;
-  int sect, last, ver, save, resched;
-  uint8_t  seg;
-  uint16_t onid, tsid, sid;
-  uint32_t extraid;
-  mpegts_service_t     *svc;
-  mpegts_mux_t         *mm  = mt->mt_mux;
-  epggrab_ota_map_t    *map = mt->mt_opaque;
-  epggrab_module_t     *mod = (epggrab_module_t *)map->om_module;
-  epggrab_ota_mux_t    *ota = NULL;
-  mpegts_table_state_t *st;
-#endif
   int r;
   int sect, last, ver;
   int count, i;

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index be40c210ede865850f97e6692a163b6b5eed746f..6e4dab54a9364838aac791c97f9701958c265477 100644 (file)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -360,7 +360,6 @@ enum mpegts_mux_epg_flag
   MM_EPG_ENABLE,
   MM_EPG_FORCE,
   MM_EPG_ONLY_EIT,
-  MM_EPG_ONLY_PSIP,
   MM_EPG_ONLY_UK_FREESAT,
   MM_EPG_ONLY_UK_FREEVIEW,
   MM_EPG_ONLY_VIASAT_BALTIC,
@@ -368,6 +367,7 @@ enum mpegts_mux_epg_flag
   MM_EPG_ONLY_OPENTV_SKY_ITALIA,
   MM_EPG_ONLY_OPENTV_SKY_AUSAT,
   MM_EPG_ONLY_BULSATCOM_39E,
+  MM_EPG_ONLY_PSIP,
 };
 #define MM_EPG_LAST MM_EPG_ONLY_OPENTV_SKY_AUSAT
 

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index fde69fb375595f0de5c299c8ac6025a75de15c07..459dfaaf521395637610f2cab480dc172185aadc 100644 (file)
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -459,6 +459,7 @@ mpegts_mux_epg_list ( void *o, const char *lang )
     { N_("Enable (auto)"),            MM_EPG_ENABLE },
     { N_("Force (auto)"),             MM_EPG_FORCE },
     { N_("Only EIT"),                 MM_EPG_ONLY_EIT },
+    { N_("Only PSIP (ATSC)"),         MM_EPG_ONLY_PSIP },
     { N_("Only UK Freesat"),          MM_EPG_ONLY_UK_FREESAT },
     { N_("Only UK Freeview"),         MM_EPG_ONLY_UK_FREEVIEW },
     { N_("Only Viasat Baltic"),       MM_EPG_ONLY_VIASAT_BALTIC },