From 40b911eef621ec7d8126f571e89210278001a28b Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Mon, 30 Jul 2012 09:52:11 +0100 Subject: [PATCH] Tidied up some of the debug statements (put them on appropriate levels etc.). Fixes #41. --- src/epggrab/module.c | 1 + src/epggrab/module/eit.c | 3 ++- src/epggrab/module/opentv.c | 12 ++++++------ src/epggrab/module/pyepg.c | 1 - src/epggrab/otamux.c | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/epggrab/module.c b/src/epggrab/module.c index a2b3bdcf..02c6bf9e 100644 --- a/src/epggrab/module.c +++ b/src/epggrab/module.c @@ -93,6 +93,7 @@ epggrab_module_t *epggrab_module_create /* Insert */ assert(!epggrab_module_find_by_id(id)); LIST_INSERT_HEAD(&epggrab_modules, skel, link); + tvhlog(LOG_INFO, "epggrab", "module %s created", id); return skel; } diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c index f02b5c1e..642e191f 100644 --- a/src/epggrab/module/eit.c +++ b/src/epggrab/module/eit.c @@ -403,7 +403,8 @@ static int _eit_process_event /* Find broadcast */ ebc = epg_broadcast_find_by_time(svc->s_ch, start, stop, eid, 1, &save2); - tvhlog(LOG_DEBUG, mod->id, "eid=%5d, start=%lu, stop=%lu, ebc=%p", eid, start, stop, ebc); + tvhlog(LOG_DEBUG, mod->id, "eid=%5d, start=%lu, stop=%lu, ebc=%p", + eid, start, stop, ebc); if (!ebc) return dllen + 12; /* Mark re-schedule detect (only now/next) */ diff --git a/src/epggrab/module/opentv.c b/src/epggrab/module/opentv.c index 3070b061..d3b8ff93 100644 --- a/src/epggrab/module/opentv.c +++ b/src/epggrab/module/opentv.c @@ -792,7 +792,7 @@ static void _opentv_genre_load ( htsmsg_t *m ) if ((e = htsmsg_get_list(m, f->hmf_name))) { if ((r = _opentv_genre_load_one(f->hmf_name, e))) { if (r > 0) - tvhlog(LOG_INFO, "opentv", "genre map %s loaded", f->hmf_name); + tvhlog(LOG_DEBUG, "opentv", "genre map %s loaded", f->hmf_name); else tvhlog(LOG_WARNING, "opentv", "genre map %s failed", f->hmf_name); } @@ -831,7 +831,7 @@ static void _opentv_dict_load ( htsmsg_t *m ) if ((e = htsmsg_get_list(m, f->hmf_name))) { if ((r = _opentv_dict_load_one(f->hmf_name, e))) { if (r > 0) - tvhlog(LOG_INFO, "opentv", "dictionary %s loaded", f->hmf_name); + tvhlog(LOG_DEBUG, "opentv", "dictionary %s loaded", f->hmf_name); else tvhlog(LOG_WARNING, "opentv", "dictionary %s failed", f->hmf_name); } @@ -905,7 +905,7 @@ static void _opentv_prov_load ( htsmsg_t *m ) if ((e = htsmsg_get_map_by_field(f))) { if ((r = _opentv_prov_load_one(f->hmf_name, e))) { if (r > 0) - tvhlog(LOG_INFO, "opentv", "provider %s loaded", f->hmf_name); + tvhlog(LOG_DEBUG, "opentv", "provider %s loaded", f->hmf_name); else tvhlog(LOG_WARNING, "opentv", "provider %s failed", f->hmf_name); } @@ -928,21 +928,21 @@ void opentv_init ( void ) _opentv_dict_load(m); if ((m = hts_settings_load("%s/data/epggrab/opentv/dict", dr))) _opentv_dict_load(m); - tvhlog(LOG_INFO, "opentv", "dictonaries loaded"); + tvhlog(LOG_DEBUG, "opentv", "dictonaries loaded"); /* Load genres */ if ((m = hts_settings_load("epggrab/opentv/genre"))) _opentv_genre_load(m); if ((m = hts_settings_load("%s/data/epggrab/opentv/genre", dr))) _opentv_genre_load(m); - tvhlog(LOG_INFO, "opentv", "genre maps loaded"); + tvhlog(LOG_DEBUG, "opentv", "genre maps loaded"); /* Load providers */ if ((m = hts_settings_load("epggrab/opentv/prov"))) _opentv_prov_load(m); if ((m = hts_settings_load("%s/data/epggrab/opentv/prov", dr))) _opentv_prov_load(m); - tvhlog(LOG_INFO, "opentv", "providers loaded"); + tvhlog(LOG_DEBUG, "opentv", "providers loaded"); } void opentv_load ( void ) diff --git a/src/epggrab/module/pyepg.c b/src/epggrab/module/pyepg.c index 6af08edd..194b0638 100644 --- a/src/epggrab/module/pyepg.c +++ b/src/epggrab/module/pyepg.c @@ -64,7 +64,6 @@ static epg_genre_list_t HTSMSG_FOREACH(f, tags) { if (!strcmp(f->hmf_name, "genre") && (e = htsmsg_get_map_by_field(f))) { if (!egl) { egl = calloc(1, sizeof(epg_genre_list_t)); printf("alloc %p\n", egl); } - printf("GENRE %s\n", htsmsg_get_str(e, "cdata")); epg_genre_list_add_by_str(egl, htsmsg_get_str(e, "cdata")); } } diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c index f842a1a3..8e824cb2 100644 --- a/src/epggrab/otamux.c +++ b/src/epggrab/otamux.c @@ -264,7 +264,7 @@ static void _epggrab_ota_finished ( epggrab_ota_mux_t *ota ) int epggrab_ota_begin ( epggrab_ota_mux_t *ota ) { if (ota->state == EPGGRAB_OTA_MUX_IDLE) { - tvhlog(LOG_INFO, ota->grab->id, "begin processing"); + tvhlog(LOG_DEBUG, ota->grab->id, "begin processing"); ota->state = EPGGRAB_OTA_MUX_RUNNING; time(&ota->started); return 1; @@ -277,7 +277,7 @@ void epggrab_ota_complete ( epggrab_ota_mux_t *ota ) th_dvb_mux_instance_t *tdmi = ota->tdmi; if (ota->state != EPGGRAB_OTA_MUX_COMPLETE) { - tvhlog(LOG_INFO, ota->grab->id, "processing complete"); + tvhlog(LOG_DEBUG, ota->grab->id, "processing complete"); ota->state = EPGGRAB_OTA_MUX_COMPLETE; time(&ota->completed); @@ -297,7 +297,7 @@ void epggrab_ota_complete ( epggrab_ota_mux_t *ota ) /* Reset */ void epggrab_ota_cancel ( epggrab_ota_mux_t *ota ) { - tvhlog(LOG_INFO, ota->grab->id, "processing cancelled"); + tvhlog(LOG_DEBUG, ota->grab->id, "processing cancelled"); ota->state = EPGGRAB_OTA_MUX_IDLE; _epggrab_ota_finished(ota); }