Merge branch 'refs/heads/t/ff'

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index 5485b4243d56399b804cb368048b0f715a05ed66..b40fdd6743faa4650888c2bdf69756d6c12e40d8 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file audiod.h Symbols exported from audiod.c. */
 
@@ -13,68 +9,17 @@ 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
- *
- * - off: disconnect from para_server
- * - on: receive status information from para_server and play the audio stream
- * - sb: only receive status information but not the audio stream
- */
-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(bool force);
-char *get_time_string(int slot_num);
+/* defined in audiod.c */
 struct btr_node *audiod_get_btr_root(void);
-
-void stat_client_write_item(int item_num);
+__malloc char *audiod_get_decoder_flags(void);
 void clear_and_dump_items(void);
-void close_stat_clients(void);
+char *get_time_string(void);
+bool uid_is_whitelisted(uid_t uid);
 
-/** iterate over all slots */
-#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
+/* defined in audiod_command.c */
+void audiod_status_dump(bool force);
+void close_stat_clients(void);
+int handle_connect(int accept_fd, fd_set *rfds);
+void stat_client_write_item(int item_num);