diff --git a/src/music_visualizer.c b/src/music_visualizer.c index 3d45c9f..2743f68 100644 --- a/src/music_visualizer.c +++ b/src/music_visualizer.c @@ -151,25 +151,26 @@ #endif while(!over) { - if ((c = wgetch(stdscr)) == 'q') { - over = true; - } else if (c == ' ') { - pattern = (pattern + 1) % 5; - } else if (c == KEY_UP) { - statusHeight -= 1; - } else if (c == KEY_DOWN) { - statusHeight += 1; - } else if (c == KEY_LEFT) { - statusCol -= 1; - } else if (c == KEY_RIGHT) { - statusCol += 1; - } else if (c == 'r') { - statusCol = 0; - statusHeight = 0; - } else if (c == 'h') { - print_help(maxR,maxC); - } else if (c == 't') { - toggleStatus = (toggleStatus == true) ? false : true; + switch((c = wgetch(stdscr))) { + case 'q': + over = true; + case ' ': + pattern = (pattern + 1) % 5; + case KEY_UP: + statusHeight -= 1; + case KEY_DOWN: + statusHeight += 1; + case KEY_LEFT: + statusCol -= 1; + case KEY_RIGHT: + statusCol += 1; + case 'r': + statusCol = 0; + statusHeight = 0; + case 'h': + print_help(maxR,maxC); + case 't': + toggleStatus = (toggleStatus == true) ? false : true; } // select on fifo socket diff --git a/src/settings.h b/src/settings.h index 755114f..2d3f5b6 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,6 +1,9 @@ /* **** MPD options - */ +**/ +#ifdef STATUS_CHECK + +// same of mpd.conf static char defHost[] = "192.168.1.131"; static unsigned int defPort = 6600; @@ -11,11 +14,23 @@ // timeout for MPD connection to fail #define TIMEOUT 1000 +#endif /* - **** Visualizer options - */ + **** VISUALIZER options +**/ + +// define characters used while printing on screen +// FULL == 1 (char is set) +// EMPTY == 0 (char is not set) +#define FULL 'X' +#define EMPTY '.' + +// path to the MPD named pipe +// (defined: 'mpd.conf') +#define MPD_FIFO "/tmp/mpd.fifo" + // number of samples -// (a power of 2) +// (POWER OF 2) #define N_SAMPLES 1024 // if adaptive sampling should be used @@ -24,19 +39,15 @@ // set to 0 to disable #define ADAPTIVE_SAMPLING 1 -// path to the MPD named pipe -// (defined: 'mpd.conf') -#define MPD_FIFO "/tmp/mpd.fifo" - // seconds between each mpd status refresh -#define STATUS_REFRESH 5 +#define STATUS_REFRESH 1 // nuber of buffer reads whose computation is skipped (cyclically). // More skips mean less precision, nicer on older CPUs // 0 -> do not skip any -// 1 -> process one out of two +// 1 -> process one out of two (almost imperceptible, should be sufficient for slower machines) // 2 -> process one out of three -// etc +// etc (accuracy decreases visibly after niceness = 4) #define NICENESS 0 // subtracted to each component (visualized column) @@ -46,7 +57,3 @@ // adjust lateral shift on screen // might prevent full borders from being printed, adjust #define X_CORRECTION 1 - -// used while printing -#define FULL 'X' -#define EMPTY '.'