Cosmetics: Rename samplerate to sample_rate.

[paraslash.git] / recv.h

diff --git a/recv.h b/recv.h
index 74ccf77d7115b5f77ce36de21522b62f78a456e2..0da3fd6948b38b6805f7076e4eeebc83e4ed68cf 100644 (file)
--- a/recv.h
+++ b/recv.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 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.
  */


@@ -12,18 +12,14 @@
 struct receiver_node {
        /** Points to the corresponding receiver. */
        struct receiver *receiver;
 struct receiver_node {
        /** Points to the corresponding receiver. */
        struct receiver *receiver;

-       /** The output buffer. */
-       char *buf;
-       /** The amount of bytes in \a buf. */
-       size_t loaded;

        /** Receiver-specific data. */
        void *private_data;
        /** Receiver-specific data. */
        void *private_data;

-       /** Pointer to the error member of the consumer. */
-       int *output_error;

        /** Pointer to the configuration data for this instance. */
        void *conf;
        /** The task associated with this instance. */
        struct task task;
        /** Pointer to the configuration data for this instance. */
        void *conf;
        /** The task associated with this instance. */
        struct task task;

+       /** The receiver node is always the root of the buffer tree. */
+       struct btr_node *btrn;

 };
 
 /**
 };
 
 /**


@@ -54,6 +50,7 @@ struct receiver {
         * \a argc and \a argv.
         */
        void *(*parse_config)(int argc, char **argv);
         * \a argc and \a argv.
         */
        void *(*parse_config)(int argc, char **argv);

+       void (*free_config)(void *conf);

        /**
         * Open one instance of the receiver.
         *
        /**
         * Open one instance of the receiver.
         *


@@ -75,12 +72,6 @@ struct receiver {
         * \sa receiver_node.
         */
        void (*close)(struct receiver_node *rn);
         * \sa receiver_node.
         */
        void (*close)(struct receiver_node *rn);

-       /**
-        * Deactivate the receiver.
-        *
-        * Clean up what init has allocated.
-        */
-       void (*shutdown)(void);

        /**
         * Add file descriptors to fd_sets and compute timeout for select(2).
         *
        /**
         * Add file descriptors to fd_sets and compute timeout for select(2).
         *


@@ -105,6 +96,7 @@ struct receiver {
         */
        void (*post_select)(struct sched *s, struct task *t);
 
         */
        void (*post_select)(struct sched *s, struct task *t);
 

+       /** The two help texts of this receiver. */

        struct ggo_help help;
 };
 
        struct ggo_help help;
 };
 


@@ -127,7 +119,10 @@ extern struct receiver receivers[];
        UDP_RECEIVER \
        {.name = NULL}};
 
        UDP_RECEIVER \
        {.name = NULL}};
 

+/** Iterate over all available receivers. */

 #define FOR_EACH_RECEIVER(i) for (i = 0; receivers[i].name; i++)
 
 #define FOR_EACH_RECEIVER(i) for (i = 0; receivers[i].name; i++)
 

+void recv_init(void);

 void *check_receiver_arg(char *ra, int *receiver_num);
 void print_receiver_helps(int detailed);
 void *check_receiver_arg(char *ra, int *receiver_num);
 void print_receiver_helps(int detailed);

+int generic_recv_pre_select(struct sched *s, struct task *t);