alsa: Kill unnecessary -B option.
authorAndre Noll <maan@systemlinux.org>
Thu, 31 Dec 2009 18:29:24 +0000 (19:29 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 31 Dec 2009 18:29:24 +0000 (19:29 +0100)
alsa_write.c
ggo/alsa_write.m4

index 5959545..e2ca45b 100644 (file)
@@ -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;
index 3f2654b..afcefcc 100644 (file)
@@ -1,5 +1,4 @@
 include(header.m4)
-include(buffer_tree.m4)
 
 <qu>
 option "device" d