X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=b9cfb25e8a34a931dab19e67303813f46ab6b738;hp=4c3212228ba5ad75dac7241d10c47ebdb0478652;hb=6fbd93c8420823356a24a3637d332c23c0c85dcd;hpb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3

diff --git a/audiod.h b/audiod.h
index 4c321222..b9cfb25e 100644
--- a/audiod.h
+++ b/audiod.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file audiod.h symbols exported from audiod.c */
+/** \file audiod.h Symbols exported from audiod.c. */
 
 
 /** enum of audio formats supported by para_audiod */
@@ -13,9 +13,6 @@ enum {AUDIOD_AUDIO_FORMATS_ENUM};
 /** array of audio format names supported by para_audiod */
 extern const char *audio_formats[];
 
-/** maximal number of simultaneous instances */
-#define MAX_STREAM_SLOTS 5
-
 /**
  * the possible modes of operation
  *
@@ -25,55 +22,15 @@ extern const char *audio_formats[];
  */
 enum audiod_status_info {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY};
 
-/** defines one command of para_audiod */
-struct audiod_command {
-	/** the name of the command */
-	const char *name;
-	/** pointer to the function that handles the command */
-	int (*handler)(int, int, char**);
-	/** one-line description of the command */
-	const char *description;
-	/** summary of the command line options */
-	const char *usage;
-	/** the long help text */
-	const char *help;
-};
-
-/**
- * Describes one instance of a receiver-filter-writer chain.
- *
- * \sa receiver_node, receiver, filter, filter_node, writer, writer_node,
- * writer_node_group.
- */
-struct slot_info {
-	/** Number of the audio format in this slot. */
-	int format;
-	/** The stream_start status item announced by para_server.  */
-	struct timeval server_stream_start;
-	/** The offset status item announced by para_server. */
-	unsigned offset_seconds;
-	/** The seconds_total status item announced by para_server. */
-	unsigned seconds_total;
-	/** The receiver info associated with this slot. */
-	struct receiver_node *receiver_node;
-	/** The array of filter nodes. */
-	struct filter_node *fns;
-	/** The array of writers attached to the last filter. */
-	struct writer_node *wns;
-};
-
-extern struct slot_info slot[MAX_STREAM_SLOTS];
 extern struct audiod_args_info conf;
 extern int audiod_status;
 
-void __noreturn clean_exit(int status, const char *msg);
-int handle_connect(int accept_fd, fd_set *rfds);
-void audiod_status_dump(void);
-char *get_time_string(int slot_num);
+int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist);
+void audiod_status_dump(bool force);
+__malloc char *audiod_get_decoder_flags(void);
+char *get_time_string(void);
 struct btr_node *audiod_get_btr_root(void);
 
 void stat_client_write_item(int item_num);
 void clear_and_dump_items(void);
-
-/** iterate over all slots */
-#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
+void close_stat_clients(void);