alsa: Kill unnecessary -B option.

diff --git a/alsa_write.c b/alsa_write.c
index 5959545f81e706ad3ebaa34ffb83104d139ca5fb..e2ca45b626dd6f04ca84c14ac25e98c0d47cc741 100644 (file)
--- 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)
 {
 }
 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);
                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)
 {
 }
 
 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;
        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 (!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;
                size_t sz = btr_get_input_queue_size(wn->btrn);
                if (sz < pad->bytes_per_frame)
                        return 1;

diff --git a/ggo/alsa_write.m4 b/ggo/alsa_write.m4
index 3f2654b43e0bba3e5689dd0ffb394ae4721866ee..afcefccfacbc3af3d6ccb077db9d81d2aa6151a5 100644 (file)
--- a/ggo/alsa_write.m4
+++ b/ggo/alsa_write.m4
@@ -1,5 +1,4 @@
 include(header.m4)
 include(header.m4)

-include(buffer_tree.m4)

 
 <qu>
 option "device" d
 
 <qu>
 option "device" d