X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.h;h=5e049179c37c96a406d4504767705c1a9925cd73;hp=9c98cf62a3bdb233155ef2a970d0982f26d7d2a1;hb=e63886e85c55c99e9732e5715b7ce641eff09914;hpb=2cfb78331c33cb74c6abf357e8221604c3c9ec47

diff --git a/server.h b/server.h
index 9c98cf62..5e049179 100644
--- a/server.h
+++ b/server.h
@@ -43,7 +43,7 @@ struct sender_command_data{
 };
 
 /**
- * used for parent-child communication
+ * Used for parent-child communication.
  *
  * There's only one struct of this type which lives in shared memory
  * for communication between the server instances. Access to this
@@ -59,57 +59,53 @@ struct sender_command_data{
  *	date.
  */
 struct misc_meta_data {
-/** information on the current audio file  */
-	struct audio_format_info afi;
-/** the size of the current audio file in bytes */
+	/** the size of the current audio file in bytes */
 	size_t size;
-/** the full path of the current audio file */
+	/** the full path of the current audio file */
 	char filename[_POSIX_PATH_MAX];
-/** the last modification file of the current audio file */
+	/** the last modification time of the current audio file */
 	time_t mtime;
-/** the number of the current audio format */
-	int audio_format;
-/** the "old" status flags -- commands may only read them */
+	/** the "old" status flags -- commands may only read them */
 	unsigned int vss_status_flags;
-/** the new status flags -- commands may set them **/
+	/** The new status flags -- commands may set them. */
 	unsigned int new_vss_status_flags;
-/** the number of data chunks sent for the current audio file */
+	/** the number of data chunks sent for the current audio file */
 	long unsigned chunks_sent;
-/** set by the jmp/ff commands to the new position in chunks */
+	/** set by the jmp/ff commands to the new position in chunks */
 	long unsigned repos_request;
-/** the number of the chunk currently sent out*/
+	/** The number of the chunk currently sent out. */
 	long unsigned current_chunk;
-/** the milliseconds that have been skipped of the current audio file */
+	/** the milliseconds that have been skipped of the current audio file */
 	long offset;
-/** the time para_server started to stream */
+	/** the time para_server started to stream */
 	struct timeval stream_start;
-/** the event counter
- *
- * commands may increase this to force a status update to be sent to all
- * connected clients
-*/
+	/**
+	 * The event counter.
+	 *
+	 * Commands may increase this to force a status update to be sent to all
+	 * connected clients.
+	 */
 	unsigned int events;
-/** the number of audio files already sent */
+	/** the number of audio files already sent */
 	unsigned int num_played;
-/** the number of executed commands */
+	/** the number of executed commands */
 	unsigned int num_commands;
-/** the number of connections para_server received so far */
+	/** the number of connections para_server received so far */
 	unsigned int num_connects;
-/** the number of connections currently active */
+	/** the number of connections currently active */
 	unsigned int active_connections;
-/** the process id of para_server */
+	/** the process id of para_server */
 	pid_t server_pid;
-/** a string that gets filled in by the current audio file selector */
-	char selector_info[MMD_INFO_SIZE];
-/** the number if the current audio file selector */
-	int selector_num;
-/** commands set this to non-zero to change the current selector */
-	int selector_change;
-/** used by the sender command */
+	/** This gets updated by afs and contains its current mode. */
+	char afs_mode_string[MAXLINE];
+	/** used by the sender command */
 	struct sender_command_data sender_cmd_data;
+	/** Describes the current audio file. */
+	struct audio_file_data afd;
 };
 
 extern struct server_args_info conf;
+extern int afs_socket;
 
 int handle_connect(int fd, struct sockaddr_in *addr);
 void mmd_unlock(void);