Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

[paraslash.git] / recv.h

diff --git a/recv.h b/recv.h
index 3c8b543bda88f50d57bb1cc975dd95085d19a392..63624b6a7bab31c2efda9f5f4f3e0d896456c56f 100644 (file)
--- a/recv.h
+++ b/recv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
-/** \file recv.h receiver-relates structures and exported symbols of recv_common.c */
+/** \file recv.h receiver-related structures and exported symbols of recv_common.c */
 
 /**
  * describes one instance of a receiver
@@ -32,6 +32,8 @@ struct receiver_node {
        void *private_data;
        /** set to 1 if end of file is reached */
        int eof;
+       /** pointer to the eof member of the consumer */
+       int *output_eof;
        /** pointer to the configuration data for this instance */
        void *conf;
        /** the task associated with this instance */
@@ -45,14 +47,10 @@ struct receiver_node {
  */
 struct receiver {
 /**
- *
- *
  * the name of the receiver
  */
        const char *name;
 /**
- *
- *
  * the receiver init function
  *
  * It must fill in all other function pointers and is assumed to succeed.
@@ -61,8 +59,6 @@ struct receiver {
  */
        void (*init)(struct receiver *r);
 /**
- *
- *
  * the command line parser of the receiver
  *
  * It should check whether the command line options given by \a argc and \a
@@ -70,12 +66,9 @@ struct receiver {
  * receiver-specific configuration data determined by \a argc and \a argv.
  * Note that this might be called more than once with different values of
  * \a argc and \a argv.
- *
  */
        void * (*parse_config)(int argc, char **argv);
 /**
- *
- *
  * open one instance of the receiver
  *
  * This should allocate the output buffer of \a rn. and may also perform any
@@ -88,9 +81,7 @@ struct receiver {
  */
        int (*open)(struct receiver_node *rn);
 /**
- *
- *
- * close one instance of the receiver
+ * close this instance of the receiver
  *
  * It should free all resources associated with given receiver node that were
  * allocated during the corresponding open call.
@@ -99,29 +90,22 @@ struct receiver {
  */
        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)
  *
  * The pre_select function gets called from the driving application before
  * entering its select loop. The receiver may use this hook to add any file
  * descriptors to the sets of file descriptors given by \a s.
  *
- *
  * \sa select(2), time.c struct task, struct sched
  */
        void (*pre_select)(struct sched *s, struct task *t);
 /**
- *
- *
  * evaluate the result from select()
  *
  * This hook gets called after the call to select(). It should check all file
@@ -129,7 +113,6 @@ struct receiver {
  * call to pre_select. According to the result, it may then use any
  * non-blocking I/O to establish a connection or to receive the audio data.
  *
- *
  * \sa select(2), struct receiver
  */
        void (*post_select)(struct sched *s, struct task *t);
@@ -149,17 +132,14 @@ extern void ortp_recv_init(struct receiver *r);
 #define ORTP_RECEIVER
 #endif
 
-void *check_receiver_arg(char *ra, int *receiver_num);
-
-
 extern struct receiver receivers[];
-extern void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
-extern void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
+/** \endcond */
 
+/** define an array of all available receivers */
 #define DEFINE_RECEIVER_ARRAY struct receiver receivers[] = { \
        HTTP_RECEIVER \
        DCCP_RECEIVER \
        ORTP_RECEIVER \
        {.name = NULL}};
 
-/** \endcond */
+void *check_receiver_arg(char *ra, int *receiver_num);