diff --git a/fft.c b/fft.c index 483b037..fa7a866 100755 --- a/fft.c +++ b/fft.c @@ -102,23 +102,18 @@ } free(outputComponents); - + return fftSig; } unsigned int* -average_signal(unsigned int *fftBuf, int inLen, int maxC, int *avgLen) +average_signal(unsigned int *fftBuf, int inLen, int maxC) { unsigned int* fftAvg = malloc(inLen*sizeof(unsigned int)); int i, j, step, k=0; unsigned int avg; - if(maxC < 200){ - *avgLen = 128; - } else { - *avgLen = 512; - } - step = inLen/(2*(*avgLen)); + step = inLen/128; for(i=0; i maxR || fftAvg[i] < 0){ - fftAvg[i] = 1; - } - print_col(i+j-correction, fftAvg[i], maxR); + for(i=correction; i maxR || fftAvg[i] < 0){ + fftAvg[i] = 1; } + print_col(i-correction, fftAvg[i], maxR, atoi(argv[1])); + /*print_col(i-correction+1, fftAvg[i], maxR);*/ } refresh(); free(fftAvg); diff --git a/utils_curses.c b/utils_curses.c index 6af334f..e537a7a 100755 --- a/utils_curses.c +++ b/utils_curses.c @@ -13,7 +13,7 @@ init_pair(4, COLOR_BLUE, -1); init_pair(5, COLOR_CYAN, -1); init_pair(6, COLOR_MAGENTA, -1); - init_pair(7, COLOR_WHITE, -1); + init_pair(8, COLOR_WHITE, -1); } } @@ -30,12 +30,17 @@ } void -print_col(int col, int length, int maxR) +print_col(int col, int l, int maxR, int color) { - int row, l; - l = maxR - length; - for(row=maxR; row>l; row--){ - mvaddch(row, col, SHARP); + int row; + int changeCol; + for(row=maxR; row>=0; row--){ + color++; + changeCol = color % 6; + if (!(row > l && row < maxR-l/3)) { // center of the screen + color_set(changeCol, NULL); + mvaddch(row, col, SHARP); + } } } diff --git a/utils_curses.h b/utils_curses.h index b02c2fb..6a866ff 100755 --- a/utils_curses.h +++ b/utils_curses.h @@ -1,7 +1,8 @@ #include -#define SHARP '|' +#define SHARP 'x' +#define HEAVY '.' void init_color_pairs(); WINDOW* curses_init(); -void print_col(int col, int length, int maxR); +void print_col(int col, int length, int maxR, int color);