Fix ogg streaming.

[paraslash.git] / server.h

diff --git a/server.h b/server.h
index 0cdd0e609c907ccb1cb8e58b0502413f86079ce6..a83aaae29aa59362f9665c08c1abcb899cbfdb6c 100644 (file)
--- a/server.h
+++ b/server.h
@@ -17,7 +17,7 @@ struct server_command {
 /** the name of the command */
        const char *name;
 /** pointer to the function that handles the command */
-       int (*handler)(int, int, char **);
+       int (*handler)(int, int, char * const * const);
 /** the privileges a user must have to execute this command */
        unsigned int perms;
 /** one-line description of the command */
@@ -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,51 @@ 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 */
-       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);