Disabled debug logging, ensured that all debug logging only active if one of the DEBUG_* is defined

4 files changed, 21 insertions, 3 deletions

diff --git a/device.c b/device.c
index e47014c..1b1156e 100644
--- a/device.c
+++ b/device.c
@@ -87,7 +87,9 @@ cMcliDevice::cMcliDevice (void)
 	m_camref = NULL;
 	InitMcli ();
 
+#ifdef DEBUG_RESOURCES
 	dsyslog ("Mcli::%s: DVB got device number %d\n", __FUNCTION__, CardIndex () + 1);
+#endif
 
 }
 
@@ -95,7 +97,9 @@ cMcliDevice::~cMcliDevice ()
 {
 	LOCK_THREAD;
 	StopSectionHandler ();
+#ifdef DEBUG_RESOURCES
 	dsyslog ("Mcli::%s: DVB %d gets destructed\n", __FUNCTION__, CardIndex () + 1);
+#endif
 	Cancel (0);
 	m_locked.Broadcast ();
 	ExitMcli ();
diff --git a/filter.c b/filter.c
index fdcbe7a..cee4e5c 100644
--- a/filter.c
+++ b/filter.c
@@ -160,7 +160,9 @@ bool cMcliFilter::PutSection (const uchar * Data, int Length, bool Pusi)
 		}
 
 		if (m_Used > length) {
+#ifdef DEBUG_FILTER
 			dsyslog ("cMcliFilter::PutSection: m_Used > length !  Pid %2d, Tid%2d " "(len %3d, got %d/%d)", m_Pid, m_Tid, Length, m_Used, length);
+#endif
 			if (Length < TS_SIZE - 5) {
 				// TS packet not full -> this must be last TS packet of section data -> safe to reset now
 				Reset ();
@@ -428,7 +430,9 @@ void cMcliFilters::Action (void)
 		}
 	}
 	DELETENULL (m_PB);
+#ifdef DEBUG_FILTER
 	dsyslog ("McliFilters::Action() ended");
+#endif
 }
 
 void cMcliFilters::ProcessChunk(u_short pid, const uchar *block, int len, bool Pusi) {
diff --git a/mcli.c b/mcli.c
index c29b2c7..317daea 100644
--- a/mcli.c
+++ b/mcli.c
@@ -74,11 +74,13 @@ cOsdObject *cPluginMcli::AltMenuAction (void)
 
 			for (cMcliDeviceObject * dev = m_devs.First (); dev; dev = m_devs.Next (dev)) {
 				cMcliDevice *d = dev->d ();
+#ifdef DEBUG_TUNE
 				dsyslog("satpos: %i vpid: %i fep.freq: %i\n", satpos, vpid, fep.frequency);
+#endif
 				struct in6_addr mcg = d->GetTenData ()->mcg;
 				mcg_set_id (&mcg, 0);
 
-#if 1				//def DEBUG
+#ifdef DEBUG_TUNE
 				char str[INET6_ADDRSTRLEN];
 				inet_ntop (AF_INET6, &c->mcg, str, INET6_ADDRSTRLEN);
 				dsyslog ("MCG from MMI: %s\n", str);
@@ -329,11 +331,15 @@ int cPluginMcli::CAMPoolAdd(netceiver_info_t *nci)
 				case CA_SINGLE:
 				case CA_MULTI_SID:
 					m_cam_present = true;
+#ifdef DEBUG_RESOURCES
 					dsyslog("Found CAM");
+#endif
 					cp->max = 1;
 					break;
 				case CA_MULTI_TRANSPONDER:
+#ifdef DEBUG_RESOURCES
 					dsyslog("Found CAM");
+#endif
 					m_cam_present = true;
 					cp->max = nci->cam[j].max_sids;
 					break;
@@ -837,7 +843,9 @@ void cPluginMcli::Action (void)
 			if (!channel_switch_ok) {	// the first tuner that was found, so make VDR retune to the channel it wants...
 				cChannel *ch = Channels.GetByNumber (cDevice::CurrentChannel ());
 				if (ch) {
+#ifdef DEBUG_TUNE
 					dsyslog("Mcli::%s: cDevice::PrimaryDevice (%p)\n", __FUNCTION__, cDevice::PrimaryDevice ());
+#endif
 					channel_switch_ok = cDevice::PrimaryDevice ()->SwitchChannel (ch, true);
 				}
 			}
@@ -1009,7 +1017,9 @@ bool cPluginMcli::Service (const char *Id, void *Data)
 				strcpy (infos->name[j], nci->tuner[i].fe_info.name);
 				infos->type[j] = nci->tuner[i].fe_info.type;
 				infos->preference[j++] = nci->tuner[i].preference;
+#ifdef DEBUG_TUNE
 				dsyslog("Mcli::%s: Tuner: %s\n", __FUNCTION__, nci->tuner[i].fe_info.name);
+#endif
 			}
 		}
 		nc_unlock_list ();
diff --git a/mcli.h b/mcli.h
index 36efb68..87c97c2 100644
--- a/mcli.h
+++ b/mcli.h
@@ -37,8 +37,8 @@
 
 //#define DEBUG_PIDS 
 //#define DEBUG_TUNE_EXTRA
-#define DEBUG_TUNE
-#define DEBUG_RESOURCES
+//#define DEBUG_TUNE
+//#define DEBUG_RESOURCES
 
 class cMcliDeviceObject:public cListObject
 {