Merge branch 't/recv_improvements'

[paraslash.git] / oss_write.c

diff --git a/oss_write.c b/oss_write.c
index 090f990565ce10b7eb85bd8dde2c391c132797c4..d583c2338bb1dc0dc96d274d49824d45a3b75c6e 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <regex.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>

-#include <dirent.h>

 #include <sys/soundcard.h>
 #include <stdbool.h>
 
 #include <sys/soundcard.h>
 #include <stdbool.h>
 


@@ -88,7 +87,6 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
        struct oss_write_args_info *conf = wn->conf;
        struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
 
        struct oss_write_args_info *conf = wn->conf;
        struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
 

-       wn->private_data = powd;

        PARA_INFO_LOG("opening %s\n", conf->device_arg);
        ret = para_open(conf->device_arg, O_WRONLY, 0);
        if (ret < 0)
        PARA_INFO_LOG("opening %s\n", conf->device_arg);
        ret = para_open(conf->device_arg, O_WRONLY, 0);
        if (ret < 0)


@@ -149,6 +147,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
                        sample_rate);
        }
        wn->min_iqs = powd->bytes_per_frame;
                        sample_rate);
        }
        wn->min_iqs = powd->bytes_per_frame;

+       wn->private_data = powd;

        return 1;
 err:
        close(powd->fd);
        return 1;
 err:
        close(powd->fd);


@@ -185,7 +184,7 @@ static void oss_post_select(__a_unused struct sched *s,
        bytes = btr_next_buffer(btrn, &data);
        frames = bytes / powd->bytes_per_frame;
        if (!frames) { /* eof and less than a single frame available */
        bytes = btr_next_buffer(btrn, &data);
        frames = bytes / powd->bytes_per_frame;
        if (!frames) { /* eof and less than a single frame available */

-               ret = -E_OSS_EOF;
+               ret = -E_WRITE_COMMON_EOF;

                goto out;
        }
        ret = 0;
                goto out;
        }
        ret = 0;