diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp
index 85472f6..08158b3 100644
--- a/libarmbox/dmx.cpp
+++ b/libarmbox/dmx.cpp
@@ -455,7 +455,7 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char * const filt
 	hal_debug("%s #%d pid:0x%04hx fd:%d type:%s len:%d to:%d flags:%x flt[0]:%02x\n", __func__, num,
 		pid, fd, DMX_T[dmx_type], len, s_flt.timeout, s_flt.flags, s_flt.filter.filter[0]);
 
-	if (HAL_DEBUG_DEMUX) {
+	if (debuglevel == 2) {
 		fprintf(stderr,"filt: "); for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]); fprintf(stderr, "\n");
 		fprintf(stderr,"mask: "); for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.mask  [i]); fprintf(stderr, "\n");
 		fprintf(stderr,"mode: "); for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.mode  [i]); fprintf(stderr, "\n");
diff --git a/libgeneric-pc/dmx.cpp b/libgeneric-pc/dmx.cpp
index 8988e22..46fddea 100644
--- a/libgeneric-pc/dmx.cpp
+++ b/libgeneric-pc/dmx.cpp
@@ -347,7 +347,7 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char * const filt
 	hal_debug("%s #%d pid:0x%04hx fd:%d type:%s len:%d to:%d flags:%x flt[0]:%02x\n", __func__, num,
 		pid, fd, DMX_T[dmx_type], len, s_flt.timeout,s_flt.flags, s_flt.filter.filter[0]);
 
-	if (HAL_DEBUG_DEMUX) {
+	if (debuglevel == 2) {
 		fprintf(stderr,"filt: ");for(int i=0;i<DMX_FILTER_SIZE;i++)fprintf(stderr,"%02hhx ",s_flt.filter.filter[i]);fprintf(stderr,"\n");
 		fprintf(stderr,"mask: ");for(int i=0;i<DMX_FILTER_SIZE;i++)fprintf(stderr,"%02hhx ",s_flt.filter.mask  [i]);fprintf(stderr,"\n");
 		fprintf(stderr,"mode: ");for(int i=0;i<DMX_FILTER_SIZE;i++)fprintf(stderr,"%02hhx ",s_flt.filter.mode  [i]);fprintf(stderr,"\n");
diff --git a/libraspi/dmx.cpp b/libraspi/dmx.cpp
index ed20cbc..76dcd0c 100644
--- a/libraspi/dmx.cpp
+++ b/libraspi/dmx.cpp
@@ -346,7 +346,7 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char * const filt
 	hal_debug("%s #%d pid:0x%04hx fd:%d type:%s len:%d to:%d flags:%x flt[0]:%02x\n", __func__, num,
 		pid, fd, DMX_T[dmx_type], len, s_flt.timeout,s_flt.flags, s_flt.filter.filter[0]);
 
-	if (HAL_DEBUG_DEMUX) {
+	if (debuglevel == 2) {
 		fprintf(stderr,"filt: ");for(int i=0;i<DMX_FILTER_SIZE;i++)fprintf(stderr,"%02hhx ",s_flt.filter.filter[i]);fprintf(stderr,"\n");
 		fprintf(stderr,"mask: ");for(int i=0;i<DMX_FILTER_SIZE;i++)fprintf(stderr,"%02hhx ",s_flt.filter.mask  [i]);fprintf(stderr,"\n");
 		fprintf(stderr,"mode: ");for(int i=0;i<DMX_FILTER_SIZE;i++)fprintf(stderr,"%02hhx ",s_flt.filter.mode  [i]);fprintf(stderr,"\n");
diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp
index 1cb2409..5dd2834 100644
--- a/libspark/dmx.cpp
+++ b/libspark/dmx.cpp
@@ -457,7 +457,7 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char * const filt
 	hal_debug("%s #%d pid:0x%04hx fd:%d type:%s len:%d to:%d flags:%x flt[0]:%02x\n", __func__, num,
 		pid, fd, DMX_T[dmx_type], len, s_flt.timeout, s_flt.flags, s_flt.filter.filter[0]);
 
-	if (HAL_DEBUG_DEMUX) {
+	if (debuglevel == 2) {
 		fprintf(stderr,"filt: "); for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.filter[i]); fprintf(stderr, "\n");
 		fprintf(stderr,"mask: "); for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.mask  [i]); fprintf(stderr, "\n");
 		fprintf(stderr,"mode: "); for (int i = 0; i < len; i++) fprintf(stderr, "%02hhx ", s_flt.filter.mode  [i]); fprintf(stderr, "\n");