audiod: fix enum of supported audio formats

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index f77ebcd1c8d61f5b5f7c5b78268c1743ac0f8448..8faf323118aca2c6dc7e859a9192f1f39907b2fe 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -1,12 +1,10 @@
 /** \file audiod.h symbols exported from audiod.c */
 int num_filters(int audio_format_num);
 int get_audio_format_num(char *name);
-enum {
-       AUDIO_FORMAT_MP3,
-       AUDIO_FORMAT_OGG,
-       AUDIO_FORMAT_AAC,
-       NUM_AUDIO_FORMATS
-};
+
+/* audio formats supportedby para_audiod */
+enum { AUDIOD_AUDIO_FORMATS_ENUM};
+
 extern const char *audio_formats[];
 #define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", "aac", NULL}
 #define MAX_STREAM_SLOTS 5
@@ -54,18 +52,15 @@ struct audiod_task {
  * \sa struct task, struct sched
  */
 struct status_task {
-       /** the output of the stat command is read from this fd */
-       int fd;
-       /** stat data is stored here */
-       char buf[STRINGSIZE];
-       /** number of bytes loaded in \a buf */
-       unsigned loaded;
+       /** the associated task structure of audiod */
+       struct task task;
+       struct private_client_data *pcd;
        /** the array of status items sent by para_server */
        char *stat_item_values[NUM_STAT_ITEMS];
-       /** the associated task structure */
-       struct task task;
        /** do not restart client command until this time */
        struct timeval restart_barrier;
+       /** last time we received status data from para_server */
+       struct timeval last_status_read;
        /** the offset value announced by para_server */
        int offset_seconds;
        /** the length of the current audio file as announced by para_server */
@@ -76,21 +71,20 @@ struct status_task {
        struct timeval sa_time_diff;
        /** whether client time is ahead of server time */
        int sa_time_diff_sign;
-       /** the audio format announced in server status */
-       char *af_status;
        /** non-zero if \a af_status is "playing" */
        int playing;
 };
 
 extern struct status_task *stat_task;
 extern struct slot_info slot[MAX_STREAM_SLOTS];
-extern struct gengetopt_args_info conf;
+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);
 
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)