oss fixes and cleanups.
authorAndre Noll <maan@systemlinux.org>
Wed, 13 Jan 2010 21:40:23 +0000 (22:40 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 13 Jan 2010 21:40:23 +0000 (22:40 +0100)
- Kill ->samplerate and ->channels of struct private_oss_write_data.
- Don't invalidate the config on close().
- Simplify oss_pre_select_btr().

oss_write.c

index f64603c..b002113 100644 (file)
 struct private_oss_write_data {
        /** The file handle of the device. */
        int fd;
 struct private_oss_write_data {
        /** The file handle of the device. */
        int fd;
-       /**
-        * The samplerate given by command line option or the decoder
-        * of the writer node group.
-        */
-       int samplerate;
-       /**
-        * The number of channels, given by command line option or the
-        * decoder of the writer node group.
-        */
-       int channels;
        /** Four bytes for stereo streams, two bytes for mono streams. */
        int bytes_per_frame;
 };
        /** Four bytes for stereo streams, two bytes for mono streams. */
        int bytes_per_frame;
 };
@@ -54,16 +44,9 @@ static void oss_pre_select_btr(struct sched *s, struct task *t)
 
        t->error = 0;
        if (ret < 0)
 
        t->error = 0;
        if (ret < 0)
-               goto min_delay;
-       if (ret == 0)
-               return;
-       if (!powd)
-               goto min_delay;
-       para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
-       return;
-min_delay:
-       s->timeout.tv_sec = 0;
-       s->timeout.tv_usec = 1;
+               sched_min_delay(s);
+       else if (ret > 0)
+               para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
 }
 
 static void oss_close(struct writer_node *wn)
 }
 
 static void oss_close(struct writer_node *wn)
@@ -71,7 +54,6 @@ static void oss_close(struct writer_node *wn)
        struct private_oss_write_data *powd = wn->private_data;
 
        close(powd->fd);
        struct private_oss_write_data *powd = wn->private_data;
 
        close(powd->fd);
-       oss_cmdline_parser_free(wn->conf);
        free(powd);
 }
 
        free(powd);
 }
 
@@ -88,7 +70,8 @@ static void oss_close(struct writer_node *wn)
  */
 static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channels)
 {
  */
 static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channels)
 {
-       int ret, format = FORMAT, ch, rate;
+       int ret, format = FORMAT;
+       unsigned ch, rate;
        struct oss_write_args_info *conf = wn->conf;
        struct private_oss_write_data *powd = wn->private_data;
 
        struct oss_write_args_info *conf = wn->conf;
        struct private_oss_write_data *powd = wn->private_data;
 
@@ -110,20 +93,17 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
        if (format != FORMAT)
                goto err;
        /* set number of channels */
        if (format != FORMAT)
                goto err;
        /* set number of channels */
-       if (!conf->channels_given && channels != 0)
-               ch = channels;
-       else
-               ch = conf->channels_arg;
        ret = -E_BAD_CHANNEL_COUNT;
        ret = -E_BAD_CHANNEL_COUNT;
-       if (ch == 0)
+       if (channels == 0)
                goto err;
                goto err;
-       powd->channels = ch;
+       ch = channels;
        ret = ioctl(powd->fd, SNDCTL_DSP_CHANNELS, &ch);
        if (ret < 0) {
                ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
        }
        ret = ioctl(powd->fd, SNDCTL_DSP_CHANNELS, &ch);
        if (ret < 0) {
                ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
        }
-       if (powd->channels != ch)
+       ret = -E_BAD_CHANNEL_COUNT;
+       if (ch != channels)
                goto err;
        powd->bytes_per_frame = ch * 2;
 
                goto err;
        powd->bytes_per_frame = ch * 2;
 
@@ -134,19 +114,15 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
         * device, the the highest possible speed is automatically used. The
         * value actually used is returned as the new value of the argument.
         */
         * device, the the highest possible speed is automatically used. The
         * value actually used is returned as the new value of the argument.
         */
-       if (!conf->samplerate_given && samplerate != 0)
-               rate = samplerate;
-       else
-               rate = conf->samplerate_arg;
-       powd->samplerate = rate;
+       rate = samplerate;
        ret = ioctl(powd->fd, SNDCTL_DSP_SPEED, &rate);
        if (ret < 0) {
                ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
        }
        ret = ioctl(powd->fd, SNDCTL_DSP_SPEED, &rate);
        if (ret < 0) {
                ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
        }
-       if (rate != powd->samplerate) {
-               int min = PARA_MIN(rate, powd->samplerate),
-                       max = PARA_MAX(rate, powd->samplerate);
+       if (rate != samplerate) {
+               unsigned min = PARA_MIN(rate, samplerate),
+                       max = PARA_MAX(rate, samplerate);
                /*
                 * Check whether the returned sample rate differs significantly
                 * from the requested one.
                /*
                 * Check whether the returned sample rate differs significantly
                 * from the requested one.
@@ -155,7 +131,7 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
                if (100 * max > 110 * min) /* more than 10% deviation */
                        goto err;
                PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate,
                if (100 * max > 110 * min) /* more than 10% deviation */
                        goto err;
                PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate,
-                       powd->samplerate);
+                       samplerate);
        }
        wn->min_iqs = powd->bytes_per_frame;
        return 1;
        }
        wn->min_iqs = powd->bytes_per_frame;
        return 1;
@@ -219,16 +195,10 @@ out:
 
 static int oss_open(struct writer_node *wn)
 {
 
 static int oss_open(struct writer_node *wn)
 {
-       struct writer_node_group *wng;
        struct private_oss_write_data *powd;
 
        powd = para_calloc(sizeof(*powd));
        wn->private_data = powd;
        struct private_oss_write_data *powd;
 
        powd = para_calloc(sizeof(*powd));
        wn->private_data = powd;
-       if (!wn->btrn) {
-               wng = wn->wng;
-               return oss_init(wn, wng->samplerate ? *wng->samplerate : 0,
-                       wng->channels? *wng->channels : 0);
-       }
        powd->fd = -1;
        return 1;
 }
        powd->fd = -1;
        return 1;
 }
@@ -238,7 +208,6 @@ __malloc static void *oss_parse_config(const char *options)
        int ret;
        struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
        int ret;
        struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
-       PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
        ret = oss_cmdline_parser_string(options, conf, "oss_write");
        if (ret)
                goto err_out;
        ret = oss_cmdline_parser_string(options, conf, "oss_write");
        if (ret)
                goto err_out;