Get rid of mmd->audio_format.

[paraslash.git] / server.h

diff --git a/server.h b/server.h
index 86d4f17393adc94cbd524e9d0ac8e74565a9148b..806a6b01db3c9a6c8f06390806e8d5693390a38c 100644 (file)
--- 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,16 +59,12 @@ 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 */
        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 */
        unsigned int vss_status_flags;
        /** The new status flags -- commands may set them. */
@@ -101,13 +97,12 @@ struct misc_meta_data {
        /** 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 of the current audio file selector. */
-       int selector_num;
+       char afs_mode_string[MAXLINE];
        /** commands set this to non-zero to change the current selector */
        int selector_change;
        /** used by the sender command */
        struct sender_command_data sender_cmd_data;
+       /** Describes the current audio file. */
        struct audio_file_data afd;
 };