From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 17 Aug 2016 10:47:17 +0000 (+0200)
Subject: dvbcam: move to new tvhlog
X-Git-Tag: v4.2.1~373
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70db72b59bea3e544a5e93e5daa87bfab0e4faf6;p=thirdparty%2Ftvheadend.git

dvbcam: move to new tvhlog
---

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
index 3fe0c9a92..237289082 100644
--- a/src/descrambler/dvbcam.c
+++ b/src/descrambler/dvbcam.c
@@ -58,7 +58,7 @@ dvbcam_register_cam(linuxdvb_ca_t * lca, uint8_t slot, uint16_t * caids,
 {
   dvbcam_active_cam_t *ac;
 
-  tvhtrace("dvbcam", "register cam ca %p slot %u num_caids %u",
+  tvhtrace(LS_DVBCAM, "register cam ca %p slot %u num_caids %u",
            lca, slot, num_caids);
 
   num_caids = MIN(CAIDS_PER_CA_SLOT, num_caids);
@@ -84,7 +84,7 @@ dvbcam_unregister_cam(linuxdvb_ca_t * lca, uint8_t slot)
   dvbcam_active_cam_t *ac, *ac_tmp;
   dvbcam_active_service_t *as;
 
-  tvhtrace("dvbcam", "unregister cam lca %p slot %u", lca, slot);
+  tvhtrace(LS_DVBCAM, "unregister cam lca %p slot %u", lca, slot);
 
   pthread_mutex_lock(&dvbcam_mutex);
 
@@ -132,7 +132,7 @@ dvbcam_pmt_data(mpegts_service_t *s, const uint8_t *ptr, int len)
     }
 
   if (!as) {
-    tvhtrace("dvbcam", "cannot find active service entry");
+    tvhtrace(LS_DVBCAM, "cannot find active service entry");
   	goto done;
   }
 
@@ -148,7 +148,7 @@ dvbcam_pmt_data(mpegts_service_t *s, const uint8_t *ptr, int len)
   /*if this is update just send updated CAPMT to CAM */
   if (is_update) {
 
-    tvhtrace("dvbcam", "CAPMT sent to CAM (update)");
+    tvhtrace(LS_DVBCAM, "CAPMT sent to CAM (update)");
     list_mgmt = CA_LIST_MANAGEMENT_UPDATE;
     goto enqueue;
   }
@@ -174,10 +174,10 @@ dvbcam_pmt_data(mpegts_service_t *s, const uint8_t *ptr, int len)
 end_of_search_for_cam:
 
   if (!ac) {
-    tvhtrace("dvbcam", "cannot find active cam entry");
+    tvhtrace(LS_DVBCAM, "cannot find active cam entry");
     goto done;
   }
-  tvhtrace("dvbcam", "found active cam entry");
+  tvhtrace(LS_DVBCAM, "found active cam entry");
 
   if (ac->active_programs++)
     list_mgmt = CA_LIST_MANAGEMENT_ADD;
@@ -197,7 +197,7 @@ dvbcam_service_start(service_t *t)
 {
   dvbcam_active_service_t *as;
 
-  tvhtrace("dvbcam", "start service %p", t);
+  tvhtrace(LS_DVBCAM, "start service %p", t);
 
   TAILQ_FOREACH(as, &dvbcam_active_services, link)
     if (as->t == t)
@@ -223,7 +223,7 @@ dvbcam_service_stop(service_t *t)
   dvbcam_active_cam_t *ac2;
   uint8_t slot = -1;
 
-  tvhtrace("dvbcam", "stop service %p", t);
+  tvhtrace(LS_DVBCAM, "stop service %p", t);
 
   pthread_mutex_lock(&dvbcam_mutex);
 
diff --git a/src/tvhlog.c b/src/tvhlog.c
index 2160ce288..38df3c874 100644
--- a/src/tvhlog.c
+++ b/src/tvhlog.c
@@ -132,6 +132,7 @@ tvhlog_subsys_t tvhlog_subsystems[] = {
   [LS_CSA]           = { "csa",           N_("CSA (descrambling)") },
   [LS_CAPMT]         = { "capmt",         N_("CAPMT CA Client") },
   [LS_CWC]           = { "cwc",           N_("CWC CA Client") },
+  [LS_DVBCAM]        = { "dvbcam",        N_("DVB CAM Client") },
   [LS_DVR]           = { "dvr",           N_("Digital Video Recorder") },
   [LS_EPG]           = { "epg",           N_("Electronic Program Guide") },
   [LS_EPGDB]         = { "epgdb",         N_("EPG Database") },
diff --git a/src/tvhlog.h b/src/tvhlog.h
index 20e770eb8..dc07d841f 100644
--- a/src/tvhlog.h
+++ b/src/tvhlog.h
@@ -161,6 +161,7 @@ enum {
   LS_CSA,
   LS_CAPMT,
   LS_CWC,
+  LS_DVBCAM,
   LS_DVR,
   LS_EPG,
   LS_EPGDB,