X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=e2ca45b626dd6f04ca84c14ac25e98c0d47cc741;hp=5959545f81e706ad3ebaa34ffb83104d139ca5fb;hb=e1c7483ab86de8a2e84c4aa6fc9116faba4ccfcf;hpb=5d83846af5410638179eb18e350278d9c7785073

diff --git a/alsa_write.c b/alsa_write.c
index 5959545f..e2ca45b6 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -159,18 +159,13 @@ static int alsa_open_btr(struct writer_node *wn)
 }
 static int alsa_open(struct writer_node *wn)
 {
-	struct alsa_write_args_info *conf = wn->conf;
-
-	if (conf->buffer_tree_given)
+	if (wn->btrn)
 		return alsa_open_btr(wn);
-	else
-		return alsa_open_nobtr(wn);
-
+	return alsa_open_nobtr(wn);
 }
 
 static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 {
-	struct alsa_write_args_info *conf = wn->conf;
 	struct private_alsa_write_data *pad = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
 	struct timeval tv;
@@ -178,7 +173,7 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 
 	if (!pad->handle)
 		return 1;
-	if (conf->buffer_tree_given) {
+	if (wn->btrn) {
 		size_t sz = btr_get_input_queue_size(wn->btrn);
 		if (sz < pad->bytes_per_frame)
 			return 1;