X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=audiod.c;h=083c2a7a1cef606a80afe4ec67b6c9f453fc5bf6;hb=e2167286448ce2ed9a01a548e7e9832563035088;hp=05a2cda39ba462d490a6e43a0876ecc8c6640265;hpb=279fe642fefe11ea606ef0124782c2d59477f5e1;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 05a2cda3..083c2a7a 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file audiod.c The paraslash's audio daemon. */
 
@@ -802,38 +798,38 @@ static int update_item(int itemnum, char *buf)
 {
 	long unsigned sec, usec;
 
-	if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
+	if (stat_task->clock_diff_count && itemnum != SI_current_time)
 		return 1;
 	free(stat_item_values[itemnum]);
 	stat_item_values[itemnum] = para_strdup(buf);
 	stat_client_write_item(itemnum);
 	switch (itemnum) {
-	case SI_STATUS_FLAGS:
+	case SI_status_flags:
 		stat_task->vss_status = 0;
 		if (strchr(buf, 'N'))
 			stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
 		if (strchr(buf, 'P'))
 			stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
 		break;
-	case SI_OFFSET:
+	case SI_offset:
 		stat_task->offset_seconds = atoi(buf);
 		break;
-	case SI_SECONDS_TOTAL:
+	case SI_seconds_total:
 		stat_task->length_seconds = atoi(buf);
 		break;
-	case SI_STREAM_START:
+	case SI_stream_start:
 		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
 			stat_task->server_stream_start.tv_sec = sec;
 			stat_task->server_stream_start.tv_usec = usec;
 		}
 		break;
-	case SI_CURRENT_TIME:
+	case SI_current_time:
 		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
 			struct timeval tv = {sec, usec};
 			compute_time_diff(&tv);
 		}
 		break;
-	case SI_FORMAT:
+	case SI_format:
 		stat_task->current_audio_format_num
 			= get_audio_format_num(buf);
 	}
@@ -1385,10 +1381,10 @@ static int status_post_select(struct sched *s, void *context)
 		client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s);
 		set_stat_task_restart_barrier(5);
 	}
-	free(stat_item_values[SI_BASENAME]);
-	stat_item_values[SI_BASENAME] = para_strdup(
+	free(stat_item_values[SI_basename]);
+	stat_item_values[SI_basename] = para_strdup(
 		"no connection to para_server");
-	stat_client_write_item(SI_BASENAME);
+	stat_client_write_item(SI_basename);
 	st->last_status_read = *now;
 out:
 	start_stop_decoders();
@@ -1497,7 +1493,7 @@ int main(int argc, char *argv[])
 	version_handle_flag("audiod", OPT_GIVEN(VERSION));
 	handle_help_flags();
 	parse_config_or_die();
-	init_random_seed_or_die();
+	crypt_init();
 	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
 	recv_init();
 	if (daemon_init_colors_or_die(OPT_UINT32_VAL(COLOR), COLOR_AUTO,
@@ -1546,7 +1542,7 @@ int main(int argc, char *argv[])
 	audiod_cleanup();
 	sched_shutdown(&sched);
 	signal_shutdown(signal_task);
-
+	crypt_shutdown();
 out:
 	lls_free_parse_result(lpr, CMD_PTR);
 	if (errctx)