write: Make get_btr_value() return void.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 240d51230fc2533e98de8cb6bbfc73ede69004bf..09cca93f4a34783e16b2bc601408184591a32362 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -228,23 +228,15 @@ again:
                return;
        }
        if (!pad->handle) {
-               struct alsa_write_args_info *conf = wn->conf;
+               int32_t val;
                if (bytes == 0) /* no data available */
                        return;
-               /* defaults */
-               pad->sample_rate = conf->sample_rate_arg;
-               pad->channels = conf->channels_arg;
-               if (!conf->sample_rate_given) { /* config option trumps btr_exec */
-                       int32_t rate;
-                       if (get_btr_sample_rate(btrn, &rate) >= 0)
-                               pad->sample_rate = rate;
-               }
-               if (!conf->channels_given) {
-                       int32_t ch;
-                       if (get_btr_channels(btrn, &ch) >= 0)
-                               pad->channels = ch;
-               }
-               PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->sample_rate);
+               get_btr_sample_rate(btrn, &val);
+               pad->sample_rate = val;
+               get_btr_channels(btrn, &val);
+               pad->channels = val;
+               PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+                       pad->sample_rate);
                ret = alsa_init(pad, wn->conf);
                if (ret < 0)
                        goto err;