Add some more derived files to .gitignore.

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index ab75c584b07e3915fb0cc4ea646af67f14e65d66..5bd41c4fa00f52f3b6b24d4508967ecd707d418d 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod.h symbols exported from audiod.c */
@@ -63,7 +51,7 @@ struct audiod_command {
 /**
  * describes one instance of a receiver-filter-writer chain
  *
- * \sa receier_node, receiver, filter, filter_node, filter_chain, writer,
+ * \sa receiver_node, receiver, filter, filter_node, filter_chain, writer,
  * writer_node, writer_node_group.
  */
 struct slot_info {
@@ -88,9 +76,7 @@ struct status_task {
        /** the associated task structure of audiod */
        struct task task;
        /** client data associated with the stat task */
-       struct private_client_data *pcd;
-       /** the array of status items sent by para_server */
-       char *stat_item_values[NUM_STAT_ITEMS];
+       struct client_task *ct;
        /** do not restart client command until this time */
        struct timeval restart_barrier;
        /** last time we received status data from para_server */
@@ -111,18 +97,19 @@ struct status_task {
        unsigned clock_diff_count;
        /** when to start the next check for clock difference */
        struct timeval clock_diff_barrier;
+       /** Number of the audio format as announced by para_server. */
+       int current_audio_format_num;
 };
 
-extern struct status_task *stat_task;
 extern struct slot_info slot[MAX_STREAM_SLOTS];
 extern struct audiod_args_info conf;
 extern int audiod_status;
-extern const char *status_item_list[NUM_STAT_ITEMS];
 
 void __noreturn clean_exit(int status, const char *msg);
 int handle_connect(int accept_fd);
 void audiod_status_dump(void);
 void dump_empty_status(void);
+char *get_time_string(struct timeval *newest_stime);
 
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)