X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.h;h=36b0f1db62e348c9ab7ccdfc3b32ba656d698c5f;hp=6fb70b9a70897e65232732a71194f666236b5a1c;hb=HEAD;hpb=1f12ea375358a0b30689e01efe82796ea4fcb14f

diff --git a/recv.h b/recv.h
index 6fb70b9a..391395b2 100644
--- a/recv.h
+++ b/recv.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file recv.h Receiver-related structures and exported symbols of recv_common.c. */
 
@@ -25,11 +21,11 @@ struct receiver_node {
 	/**
 	 * The file descriptor to receive the stream.
 	 *
-	 * The pre_select function of the receiver adds this file descriptor to
+	 * The pre_monitor function of the receiver adds this file descriptor to
 	 * the set of file descriptors which are watched for readability or
 	 * writability, depending on the state of the connection (if any).
 	 *
-	 * If \a fd is readable, the post_select function of the receiver reads
+	 * If \a fd is readable, the post_monitor function of the receiver reads
 	 * data from this fd into the buffer pool area of \a btrp.
 	 *
 	 * \sa \ref receiver.
@@ -38,25 +34,26 @@ struct receiver_node {
 };
 
 /**
- * Describes one supported paraslash receiver.
+ * Describes a possible data source for audio streams.
+ *
+ * A paraslash receiver is a modular piece of software which is capable of
+ * receiving an audio data stream from a data source. Received audio data is
+ * fed to consumers through the buffer tree mechanism.
+ *
+ * This structure contains the methods which have to be implemented by each
+ * receiver.
  *
- * \sa \ref http_recv.c, \ref udp_recv.c.
+ * \sa \ref http_recv.c, \ref udp_recv.c, \ref dccp_recv.c, \ref afh_recv.c,
+ * struct \ref receiver_node, struct \ref filter, struct \ref writer, struct
+ * \ref sched.
  */
 struct receiver {
-	/**
-	 * The optional receiver init function.
-	 *
-	 * Performs any initialization needed before the receiver can be opened.
-	 */
-	void (*init)(void);
 	/**
 	 * Open one instance of the receiver.
 	 *
 	 * This should allocate the output buffer of the given receiver node
 	 * and prepare it for retrieving the audio stream according to the
 	 * configuration stored in rn->lpr.
-	 *
-	 * \sa struct \ref receiver_node.
 	 */
 	int (*open)(struct receiver_node *rn);
 	/**
@@ -68,31 +65,10 @@ struct receiver {
 	 * \sa \ref receiver_node.
 	 */
 	void (*close)(struct receiver_node *rn);
-	/**
-	 * Add file descriptors to fd_sets and compute timeout for select(2).
-	 *
-	 * If this is not NULL, the function is called in each iteration of the
-	 * scheduler's select loop. The receiver may define it to add file
-	 * descriptors to the file descriptor sets given by s. Those will be
-	 * monitored in the subsequent call to select(2). The function may also
-	 * lower the timeout value of s to make select(2) return earlier if no
-	 * file descriptors are ready for I/O.
-	 *
-	 * \sa select(2), \ref time.c, struct \ref sched.
-	 */
-	void (*pre_select)(struct sched *s, void *context);
-	/**
-	 * Evaluate the result from select(2).
-	 *
-	 * This is called after the call to select(2). It should check all file
-	 * descriptors which were added to any of the fd sets in the previous
-	 * call to ->pre_select() and perform (non-blocking) I/O operations on
-	 * those fds which are ready for I/O, for example in order to establish
-	 * a connection or to receive a part of the audio stream.
-	 *
-	 * \sa select(2), struct \ref receiver.
-	 */
-	int (*post_select)(struct sched *s, void *context);
+	/** Ask the scheduler to monitor receive fds. */
+	void (*pre_monitor)(struct sched *s, void *context);
+	/** Receive data and make it available to consumers. */
+	int (*post_monitor)(struct sched *s, void *context);
 	/**
 	 * Answer a buffer tree query.
 	 *
@@ -118,7 +94,6 @@ struct receiver {
 /** Iterate over all available receivers. */
 #define FOR_EACH_RECEIVER(i) for (i = 1; lls_cmd(i, recv_cmd_suite); i++)
 
-void recv_init(void);
 int check_receiver_arg(const char *ra, struct lls_parse_result **lprp);
 void print_receiver_helps(bool detailed);
-int generic_recv_pre_select(struct sched *s, struct receiver_node *rn);
+int generic_recv_pre_monitor(struct sched *s, struct receiver_node *rn);