aac: fix some signedness warnings

[paraslash.git] / server.h

diff --git a/server.h b/server.h
index bd2b0500fbc2d6d0a729b4ad27ba2144bb6c882f..3f01e05e9eb70f3c73eb5e2f15dd7e08b0ca3770 100644 (file)
--- a/server.h
+++ b/server.h
@@ -19,7 +19,7 @@
 /** \file server.h common server data structures */
 
 #include "para.h"
-#include <openssl/pem.h>
+#include "afh.h"
 
 /** size of the selector_info and audio_file info strings of struct misc_meta_data */
 #define MMD_INFO_SIZE 16384
@@ -37,7 +37,7 @@ struct server_command {
 /** one-line description of the command */
        const char *description;
 /** summary of the command line options */
-       const char *synopsis;
+       const char *usage;
 /** the long help text */
        const char *help;
 };
@@ -72,14 +72,16 @@ struct sender_command_data{
  *     - The contents are listed in the stat command and have to be up to
  *     date.
  */
-struct misc_meta_data{
+struct misc_meta_data {
+/** information on the current audio file  */
+       struct audio_format_info afi;
 /** the size of the current audio file in bytes */
        long unsigned int size;
 /** the full path of the current audio file */
        char filename[_POSIX_PATH_MAX];
 /** the last modification file of the current audio file */
        time_t mtime;
-/* the number of the current audio format */
+/** the number of the current audio format */
        int audio_format;
 /** the "old" status flags -- commands may only read them */
        unsigned int vss_status_flags;
@@ -87,20 +89,14 @@ struct misc_meta_data{
        unsigned int new_vss_status_flags;
 /** the number of data chunks sent for the current audio file */
        long unsigned chunks_sent;
-/** the number of chunks this audio file contains */
-       long unsigned chunks_total;
 /** set by the jmp/ff commands to the new position in chunks */
        long unsigned repos_request;
 /** the number of the chunk currently sent out*/
        long unsigned current_chunk;
 /** the milliseconds that have been skipped of the current audio file */
        long offset;
-/** the length of the audio file in seconds */
-       int seconds_total;
 /** the time para_server started to stream */
        struct timeval stream_start;
-/** a string that gets filled in by the audio format handler */
-       char audio_file_info[MMD_INFO_SIZE];
 /** the event counter
  *
  * commands may increase this to force a status update to be sent to all