X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=94288eec702dd016dbebcaa2f5bf68a882aab1e7;hp=2d8fec1a24b9827ac8bd2e2ab0616639025ae14b;hb=eeeab4239843e716b3fd4dd259985a4cd4c487a5;hpb=dd462c7e1b61864d6da01a877ced78dab72e2244

diff --git a/audiod.h b/audiod.h
index 2d8fec1a..94288eec 100644
--- a/audiod.h
+++ b/audiod.h
@@ -1,24 +1,18 @@
 /*
- * Copyright (C) 2006-2009 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. */
 
 
-int num_filters(int audio_format_num);
-int get_audio_format_num(const char *name);
-
 /** enum of audio formats supported by para_audiod */
 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
  *
@@ -42,44 +36,15 @@ struct audiod_command {
 	const char *help;
 };
 
-/**
- * Describes one instance of a receiver-filter-writer chain.
- *
- * \sa receiver_node, receiver, filter, filter_node, filter_chain, writer,
- * writer_node, writer_node_group.
- */
-struct slot_info {
-	/** Number of the audio format in this slot. */
-	int format;
-	/** Receiver start time. */
-	struct timeval rstime;
-	/** Writer start time. */
-	struct timeval wstime;
-	/** 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 active filter chain. */
-	struct filter_chain *fc;
-	/** The active writer node group. */
-	struct writer_node_group *wng;
-};
-
-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);
-void audiod_status_dump(void);
-char *get_time_string(int slot_num);
+int handle_connect(int accept_fd, fd_set *rfds);
+void audiod_status_dump(bool force);
+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);