X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=c7998cdb7d02259b4e4da84353a2fdade8ec5584;hb=8a61aff04fa2e8860f7fd3969d58d77c0292155a;hp=ff3ba8c218a8748266eddfe2e9c5bf92bcb7c82d;hpb=c51443d1b33680e6eb6bf0bf0e4f639b30219c5f;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index ff3ba8c2..c7998cdb 100644
--- a/audiod.c
+++ b/audiod.c
@@ -289,7 +289,7 @@ out:
 		length / 60,
 		length % 60
 	);
-	PARA_DEBUG_LOG("slot %d: %s\n", slot_num, msg);
+	//PARA_DEBUG_LOG("slot %d: %s\n", slot_num, msg);
 	return msg;
 empty:
 	return para_strdup(NULL);
@@ -812,16 +812,10 @@ static int parse_receiver_args(void)
 	struct audio_format_info *a;
 
 	for (i = conf.receiver_given - 1; i >= 0; i--) {
-		char *arg = conf.receiver_arg[i];
-		char *recv_arg = strchr(arg, ':');
-		int af_mask, j;
+		char *arg;
+		int j, af_mask;
 
-		ret = -E_MISSING_COLON;
-		if (!recv_arg)
-			goto out;
-		*recv_arg = '\0';
-		recv_arg++;
-		ret = get_matching_audio_format_nums(arg);
+		ret = parse_stream_command(conf.receiver_arg[i], &arg);
 		if (ret < 0)
 			goto out;
 		af_mask = ret;
@@ -837,7 +831,7 @@ static int parse_receiver_args(void)
 			 */
 			if (a->receiver_conf)
 				a->receiver->free_config(a->receiver_conf);
-			a->receiver_conf = check_receiver_arg(recv_arg, &receiver_num);
+			a->receiver_conf = check_receiver_arg(arg, &receiver_num);
 			ret = -E_RECV_SYNTAX;
 			if (!a->receiver_conf)
 				goto out;
@@ -1054,7 +1048,6 @@ static void close_stat_pipe(void)
 {
 	if (!stat_task->ct)
 		return;
-	btr_free_node(stat_task->ct->btrn);
 	client_close(stat_task->ct);
 	stat_task->ct = NULL;
 	clear_and_dump_items();