Changeset View
Changeset View
Standalone View
Standalone View
head/audio/cava/files/patch-config.c
| Remove noncurses output method which only produces a garbled mess | Remove noncurses output method which only produces a garbled mess | ||||
| on terminals. | on terminals. | ||||
| --- config.c.orig 2020-05-29 23:28:58 UTC | --- config.c.orig 2020-10-29 12:33:01 UTC | ||||
| +++ config.c | +++ config.c | ||||
| @@ -173,10 +173,6 @@ bool validate_config(struct config_params *p, struct e | @@ -181,10 +181,6 @@ bool validate_config(struct config_params *p, struct e | ||||
| return false; | return false; | ||||
| #endif | #endif | ||||
| } | } | ||||
| - if (strcmp(outputMethod, "noncurses") == 0) { | - if (strcmp(outputMethod, "noncurses") == 0) { | ||||
| - p->om = OUTPUT_NONCURSES; | - p->om = OUTPUT_NONCURSES; | ||||
| - p->bgcol = 0; | - p->bgcol = 0; | ||||
| - } | - } | ||||
| if (strcmp(outputMethod, "raw") == 0) { // raw: | if (strcmp(outputMethod, "raw") == 0) { // raw: | ||||
| p->om = OUTPUT_RAW; | p->om = OUTPUT_RAW; | ||||
| p->bar_spacing = 0; | p->bar_spacing = 0; | ||||
| @@ -220,7 +216,7 @@ bool validate_config(struct config_params *p, struct e | @@ -220,7 +216,7 @@ bool validate_config(struct config_params *p, struct e | ||||
| #ifndef NCURSES | |||||
| write_errorf( | |||||
| error, | |||||
| - "output method %s is not supported, supported methods are: 'noncurses' and 'raw'\n", | |||||
| + "output method %s is not supported, supported methods are: 'raw'\n", | |||||
| outputMethod); | |||||
| return false; | |||||
| #endif | |||||
| @@ -228,7 +224,7 @@ bool validate_config(struct config_params *p, struct e | |||||
| #ifdef NCURSES | #ifdef NCURSES | ||||
| write_errorf(error, | write_errorf(error, | ||||
| "output method %s is not supported, supported methods are: 'ncurses', " | "output method %s is not supported, supported methods are: 'ncurses', " | ||||
| - "'noncurses' and 'raw'\n", | - "'noncurses' and 'raw'\n", | ||||
| + "and 'raw'\n", | + "and 'raw'\n", | ||||
| outputMethod); | outputMethod); | ||||
| return false; | return false; | ||||
| #endif | #endif | ||||
| @@ -408,7 +404,7 @@ bool load_config(char configPath[PATH_MAX], struct con | |||||
| } | |||||
| #ifdef NCURSES | |||||
| - outputMethod = (char *)iniparser_getstring(ini, "output:method", "noncurses"); | |||||
| + outputMethod = (char *)iniparser_getstring(ini, "output:method", "ncurses"); | |||||
| #endif | |||||
| #ifndef NCURSES | |||||
| outputMethod = (char *)iniparser_getstring(ini, "output:method", "noncurses"); | |||||