X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=dfb61db4c1d811fdedf97d5fa381defc241ae03b;hp=38aa5aafba75bcf7c67418ab7035f9eb0dbe11ff;hb=02f5def4490f7e12987b0cf77989d42045627df5;hpb=1f31b52b6816ce2716a3755a1896f77744fa167b

diff --git a/audiod.c b/audiod.c
index 38aa5aaf..dfb61db4 100644
--- a/audiod.c
+++ b/audiod.c
@@ -118,6 +118,9 @@ struct command_task {
 int get_audio_format_num(char *name)
 {
 	int i;
+
+	while (para_isspace(*name))
+		name++;
 	FOR_EACH_AUDIO_FORMAT(i)
 		if (!strcmp(name, audio_formats[i]))
 			return i;
@@ -516,7 +519,7 @@ static int check_stat_line(char *line, __a_unused void *data)
 	case SI_OFFSET:
 		stat_task->offset_seconds = atoi(line + ilen + 1);
 		break;
-	case SI_LENGTH:
+	case SI_SECONDS_TOTAL:
 		stat_task->length_seconds = atoi(line + ilen + 1);
 		break;
 	case SI_STREAM_START:
@@ -866,7 +869,7 @@ static int audiod_get_socket(void)
 		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
-	mark_fd_nonblock(fd);
+	mark_fd_nonblocking(fd);
 	return fd;
 }
 
@@ -948,7 +951,7 @@ static void close_stat_pipe(void)
 		return;
 	client_close(stat_task->pcd);
 	stat_task->pcd = NULL;
-	for (i = 0; i < NUM_STAT_ITEMS; i++) {
+	FOR_EACH_STATUS_ITEM(i) {
 		free(stat_task->stat_item_values[i]);
 		stat_task->stat_item_values[i] = NULL;
 	}
@@ -958,7 +961,7 @@ static void close_stat_pipe(void)
 	audiod_status_dump();
 	stat_task->playing = 0;
 	stat_task->stat_item_values[SI_BASENAME] = make_message(
-		"%s:no connection to para_server\n",
+		"%s: no connection to para_server\n",
 		status_item_list[SI_BASENAME]);
 	stat_client_write(stat_task->stat_item_values[SI_BASENAME],
 		SI_BASENAME);
@@ -1165,7 +1168,7 @@ int main(int argc, char *argv[])
 	register_task(audiod_task);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 99 * 1000;
-	ret = sched(&s);
+	ret = schedule(&s);
 
 	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
 	return EXIT_FAILURE;