X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.h;h=234c67a0d9eb9d09643544a498d96e5be5d69093;hp=077ce03e415f45c2937d953a8602193e7f6c68a1;hb=734073dbcac97e8ef6a9c5b3244b953a01358bc9;hpb=1db8df45ae458aec53f489b5cd414d6866f93b8c

diff --git a/audiod.h b/audiod.h
index 077ce03e..234c67a0 100644
--- a/audiod.h
+++ b/audiod.h
@@ -1,15 +1,16 @@
 /** \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
-};
+
+/** 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[];
-#define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", "aac", NULL}
+
+/** maximal number of simultaneous instances */
 #define MAX_STREAM_SLOTS 5
+
 /**
  * the possible modes of operation
  *
@@ -49,13 +50,14 @@ struct audiod_task {
 };
 
 /**
- * the task for audiod's child (para_client stat)
+ * the task for obtaining para_server's status (para_client stat)
  *
  * \sa struct task, struct sched
  */
 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];
@@ -69,12 +71,16 @@ struct status_task {
 	int length_seconds;
 	/** the start of the current stream from the view of para_server */
 	struct timeval server_stream_start;
-	/** the averaged time deviation between para_server and para_audiod */
+	/** the average time deviation between para_server and para_audiod */
 	struct timeval sa_time_diff;
 	/** whether client time is ahead of server time */
 	int sa_time_diff_sign;
-	/** non-zero if \a af_status is "playing" */
+	/** non-zero if para_server's status is "playing" */
 	int playing;
+	/** number of times the clock difference is to be checked */
+	unsigned clock_diff_count;
+	/** when to start the next check for clock difference */
+	struct timeval clock_diff_barrier;
 };
 
 extern struct status_task *stat_task;