X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.h;h=efee2dbde421587472ab9c866be50e5fa32a374a;hp=dd5184f4ca5beb3d6fbdeeaec6f2000a5409a80b;hb=fcbaa47c0cb6e3e45bf1c465180752289bbe8b6b;hpb=1446f99e3adc59d868726382a2ac7cec105372a7

diff --git a/server.h b/server.h
index dd5184f4..efee2dbd 100644
--- a/server.h
+++ b/server.h
@@ -19,6 +19,7 @@
 /** \file server.h common server data structures */
 
 #include "para.h"
+#include "afh.h"
 #include <openssl/pem.h>
 
 /** size of the selector_info and audio_file info strings of struct misc_meta_data */
@@ -72,14 +73,15 @@ 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 {
+	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