Fix config file handling for audiod and clean up init functions.

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index 8ead33440ce2a77676844b48c4faba7d6fdcb2ba..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 */
  */
 
 /** \file audiod.h symbols exported from audiod.c */


@@ -37,8 +25,8 @@ extern const char *audio_formats[];
  * - 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
  * - 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_OFF, AUDIOD_ON, AUDIOD_STANDBY};
+ */
+enum audiod_status_info {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY};

 
 /** defines one command of para_audiod */
 struct audiod_command {
 
 /** defines one command of para_audiod */
 struct audiod_command {


@@ -63,9 +51,9 @@ struct audiod_command {
 /**
  * describes one instance of a receiver-filter-writer chain
  *
 /**
  * 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.
  * writer_node, writer_node_group.

-  */
+ */

 struct slot_info {
        /** number of the audio format in this slot */
        int format;
 struct slot_info {
        /** number of the audio format in this slot */
        int format;


@@ -79,16 +67,6 @@ struct slot_info {
        struct writer_node_group *wng;
 };
 
        struct writer_node_group *wng;
 };
 

-/**
- * the main task of audiod
- *
- * \sa struct task, struct sched
- */
-struct audiod_task {
-       struct timeval *now;
-       struct task task;
-};
-

 /**
  * the task for obtaining para_server's status (para_client stat)
  *
 /**
  * the task for obtaining para_server's status (para_client stat)
  *


@@ -98,9 +76,7 @@ struct status_task {
        /** the associated task structure of audiod */
        struct task task;
        /** client data associated with the stat 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 */
        /** do not restart client command until this time */
        struct timeval restart_barrier;
        /** last time we received status data from para_server */


@@ -121,18 +97,19 @@ struct status_task {
        unsigned clock_diff_count;
        /** when to start the next check for clock difference */
        struct timeval clock_diff_barrier;
        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 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);
 
 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++)
 
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)