Merge pull request #14 from livibetter/make-debug

make debug option

README.md

@@ -53,6 +53,16 @@ Getting started
 
     make
 
+You can use the following for compilation options, value in *italic style* is the default value:
+
+| Name | Value | Description |
+| ---- | ----- | ----------- |
+| `debug` | *0* or 1 | Debugging message switch |
+
+For example, turning on debugging messages:
+
+    make debug=1
+
 ### Installing
 
 Install `cava` to default `/usr/local`:

cava.c

@@ -35,7 +35,6 @@
 struct sigaction old_action;
 int M = 2048;
 int shared[2048];
-int debug = 0;
 int format = -1;
 unsigned int rate = 0;
 
@@ -71,9 +70,10 @@ music(void* data)
 
 	if ((err = snd_pcm_open(&handle, device,  SND_PCM_STREAM_CAPTURE , 0) < 0))
 		printf("error opening stream:    %s\n", snd_strerror(err) );
-	else if (debug == 1) {
+#ifdef DEBUG
-		printf("open stream succes\n");
+	else printf("open stream succes\n");
-	}
+#endif
+
 	snd_pcm_hw_params_alloca(&params);//assembling params
 	snd_pcm_hw_params_any (handle, params);//setting defaults or something
 	snd_pcm_hw_params_set_access(handle, params,
@@ -117,19 +117,18 @@ music(void* data)
 		err = snd_pcm_readi(handle, buffer, frames);
 		if (err == -EPIPE) {
 			/* EPIPE means overrun */
-			if (debug == 1) {
+#ifdef DEBUG
 			fprintf(stderr, "overrun occurred\n");
-			}
+#endif
 			snd_pcm_prepare(handle);
 		} else if (err < 0) {
-			if (debug == 1) {
+#ifdef DEBUG
-				fprintf(stderr, "error from read: %s\n",
+			fprintf(stderr, "error from read: %s\n", snd_strerror(err));
-				        snd_strerror(err));
+#endif
-			}
 		} else if (err != (int)frames) {
-			if (debug == 1) {
+#ifdef DEBUG
 			fprintf(stderr, "short read, read %d %d frames\n", err, (int)frames);
-			}
+#endif
 		}
 
 		//sorting out one channel and only biggest octet
@@ -257,7 +256,9 @@ int main(int argc, char **argv)
 	int col = 36;
 	int bgcol = 0;
 	int sens = 100;
+#ifndef DEBUG
 	int move = 0;
+#endif
 	int fall[200];
 	float fpeak[200];
 	float k[200];
@@ -390,12 +391,15 @@ Options:\n\
 			nanosleep (&req, NULL);
 			n++;
 			if (n > 2000) {
-				if (debug == 1)
+#ifdef DEBUG
 				printf("could not get rate and or format, problems with audoi thread? quiting...\n");
+#endif
 				exit(1);
 			}
 		}
-		if (debug == 1)printf("got format: %d and rate %d\n", format, rate);
+#ifdef DEBUG
+		printf("got format: %d and rate %d\n", format, rate);
+#endif
 
 	}
 
@@ -422,12 +426,14 @@ Options:\n\
 			                1; //handle for user setting to many bars
 		height = (int)w.ws_row - 1;
 		width = (int)w.ws_col - bands - 1;
+#ifndef DEBUG
 		int matrix[width][height];
 		for (i = 0; i < width; i++) {
 			for (n = 0; n < height; n++) {
 				matrix[i][n] = 0;
 			}
 		}
+#endif
 		bw = width / bands;
 
 		g = ((float)height / 1000) * pow((60 / (float)framerate),
@@ -441,12 +447,11 @@ Options:\n\
 		rest = (((w.ws_col) - (bw * bands + bands - 1)));
 		if (rest < 0)rest = 0;
 
-		if (debug == 1)
+#ifdef DEBUG
 		printf("hoyde: %d bredde: %d bands:%d bandbredde: %d rest: %d\n",
 		       (int)w.ws_row,
 		       (int)w.ws_col, bands, bw, rest);
-
+#endif
-
 
 //**calculating cutof frequencies**/
 		for (n = 0; n < bands + 1; n++) {
@@ -464,10 +469,12 @@ Options:\n\
 				hcf[n - 1] = lcf[n] - 1;
 			}
 
-			if (debug == 1 && n != 0) {
+#ifdef DEBUG
+			if (n != 0) {
 				printf("%d: %f -> %f (%d -> %d) \n", n, fc[n - 1], fc[n], lcf[n - 1],
 				       hcf[n - 1]);
 			}
+#endif
 		}
 //exit(1);
 
@@ -480,8 +487,8 @@ Options:\n\
 
 
 //**preparing screen**//
-		if (debug == 0) {
 		virt = system("setfont cava.psf  >/dev/null 2>&1");
+#ifndef DEBUG
 		system("setterm -cursor off");
 		system("setterm -blank 0");
 //resetting console
@@ -505,7 +512,7 @@ Options:\n\
 			}
 			printf("\033[%dA", height); //backup
 		}
-		}
+#endif
 
 //debug=1;
 //**start main loop**//
@@ -522,12 +529,9 @@ Options:\n\
 				}
 			}
 
-
+#ifdef DEBUG
-			if (debug == 1) {
 			system("clear");
-			}
+#endif
-
-
 
 //**populating input buffer & checking if there is sound**//
 			lpeak = 0;
@@ -585,16 +589,18 @@ Options:\n\
 					flast[o] = f[o]; //memmory for falloff func
 
 					if (f[o] < 0.125)f[o] = 0.125;
-					if (debug == 1) {
+#ifdef DEBUG
 					printf("%d: f:%f->%f (%d->%d)peak:%f adjpeak: %f \n", o, fc[o], fc[o + 1],
 					       lcf[o], hcf[o], peak[o], f[o]);
-					}
+#endif
 				}
 				// if(debug==1){ printf("topp overall unfiltered:%f \n",peak[bands]); }
 
 				//if(debug==1){ printf("topp overall alltime:%f \n",sum);}
 			} else { //**if in sleep mode wait and continiue**//
-				if (debug == 1)printf("no sound detected for 3 sec, going to sleep mode\n");
+#ifdef DEBUG
+				printf("no sound detected for 3 sec, going to sleep mode\n");
+#endif
 				//for (i=0;i<200;i++)flast[i]=0; //zeroing memory   no more nesceseary after faloff on pauses
 				//pthread_cancel(thr_id);// this didnt work to well, killing sound thread
 				//wait 1 sec, then check sound again.
@@ -619,7 +625,7 @@ Options:\n\
 			}
 
 //**DRAWING**// -- put in function file maybe?
-			if (debug == 0) {
+#ifndef DEBUG
 			for (n = (height - 1); n >= 0; n--) {
 				o = 0;
 				move = rest / 2; //center adjustment
@@ -672,9 +678,7 @@ Options:\n\
 			req.tv_sec = 0;
 			req.tv_nsec = (1 / (float)framerate) * 1000000000; //sleeping for set us
 			nanosleep (&req, NULL);
-
+#endif
-			}
-
 		}
 	}
 	return 0;

makefile

@@ -9,6 +9,12 @@ INSTALL_BIN = $(INSTALL) -D -m 755
 PREFIX ?= /usr/local
 BINDIR  = $(DESTDIR)/$(PREFIX)/bin
 
+debug ?= 0
+
+ifeq ($(debug),1)
+CPPFLAGS += -DDEBUG
+endif
+
 all: cava
 
 cava: cava.c