Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-09 04:57:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

pretty things up a bit

Browse Source
This commit is contained in:
philippe44
2023-03-29 23:41:35 -07:00
parent cad286c8d7
commit 5ecb371fb0
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/platform_console/app_squeezelite/cmd_squeezelite.c
View File

@@ -65,7 +65,8 @@ static void squeezelite_thread(void *arg){
ESP_LOGI(TAG ,"Calling squeezelite"); ESP_LOGI(TAG ,"Calling squeezelite");
int ret = squeezelite_main(thread_parms.argc, thread_parms.argv); int ret = squeezelite_main(thread_parms.argc, thread_parms.argv);
messaging_post_message(MESSAGING_WARNING, MESSAGING_CLASS_SYSTEM, "squeezelite exited with error code %d", ret); messaging_post_message(ret > 1 ? MESSAGING_ERROR : MESSAGING_WARNING,
MESSAGING_CLASS_SYSTEM, "squeezelite exited with error code %d", ret);
if (ret == 1) { if (ret == 1) {
int wait = 60; int wait = 60;

12
components/squeezelite/main.c
View File

@@ -386,7 +386,7 @@ int squeezelite_main(int argc, char **argv) {
optarg = NULL; optarg = NULL;
optind += 1; optind += 1;
} else { } else {
fprintf(stderr, "\nOption error: -%s\n\n", opt); LOG_ERROR("=> Option error: -%s", opt);
usage(argv[0]); usage(argv[0]);
exit(1); exit(1);
} }
@@ -437,7 +437,7 @@ int squeezelite_main(int argc, char **argv) {
if (!strcmp(l, "all") || !strcmp(l, "ir")) log_ir = new; if (!strcmp(l, "all") || !strcmp(l, "ir")) log_ir = new;
#endif #endif
} else { } else {
fprintf(stderr, "\nDebug settings error: -d %s\n\n", optarg); LOG_ERROR("=> Debug settings error: -d %s", optarg);
usage(argv[0]); usage(argv[0]);
exit(1); exit(1);
} }
@@ -451,7 +451,7 @@ int squeezelite_main(int argc, char **argv) {
int byte = 0; int byte = 0;
char *tmp; char *tmp;
if (!strncmp(optarg, "00:04:20", 8)) { if (!strncmp(optarg, "00:04:20", 8)) {
LOG_ERROR("ignoring mac address from hardware player range 00:04:20:**:**:**"); LOG_ERROR("=> ignoring mac address from hardware player range 00:04:20:**:**:**");
} else { } else {
char *t = strtok(optarg, ":"); char *t = strtok(optarg, ":");
while (t && byte < 6) { while (t && byte < 6) {
@@ -689,14 +689,14 @@ int squeezelite_main(int argc, char **argv) {
exit(0); exit(0);
break; break;
default: default:
fprintf(stderr, "Arg error: %s\n", argv[optind]); LOG_ERROR("=> arg error: %s", argv[optind]);
break; break;
} }
} }
// warn if command line includes something which isn't parsed // warn if command line includes something which isn't parsed
if (optind < argc) { if (optind < argc) {
fprintf(stderr, "\nError: command line argument error\n\n"); LOG_ERROR("=> command line argument error");
usage(argv[0]); usage(argv[0]);
exit(1); exit(1);
} }
@@ -806,7 +806,7 @@ int squeezelite_main(int argc, char **argv) {
#endif #endif
if (name && namefile) { if (name && namefile) {
fprintf(stderr, "-n and -N option should not be used at same time\n"); LOG_ERROR("=> -n and -N option should not be used at same time");
exit(1); exit(1);
} }

6
components/squeezelite/utils.c
View File

@@ -69,7 +69,11 @@ const char *logtime(void) {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
strftime(buf, sizeof(buf), "[%T.", localtime(&tv.tv_sec)); strftime(buf, sizeof(buf), "[%T.", localtime(&tv.tv_sec));
sprintf(buf+strlen(buf), "%06ld]", (long)tv.tv_usec); #ifdef EMBEDDED
sprintf(buf+strlen(buf), "%03ld]", (long)tv.tv_usec/1000);
#else
sprintf(buf+strlen(buf), "%06ld]", (long)tv.tv_usec);
#endif
#endif #endif
return buf; return buf;
} }