X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=3b4b9bd0416720e5e7d9455df23221cb049a2fc8;hp=5485b4243d56399b804cb368048b0f715a05ed66;hb=95fa2283a02218120c784834cca98dc9fb1982b9;hpb=a29e6451e79365af6dce8d14f3056fc107b059fb

diff --git a/audiod.h b/audiod.h
index 5485b424..3b4b9bd0 100644
--- a/audiod.h
+++ b/audiod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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
  *
@@ -39,42 +36,15 @@ struct audiod_command {
 	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];
+__malloc char *audiod_get_decoder_flags(void);
 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);
+int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist);
 void audiod_status_dump(bool force);
-char *get_time_string(int slot_num);
+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);
 void close_stat_clients(void);
-
-/** iterate over all slots */
-#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)