X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=49aabafb30fd7dd4e743d3fd9bfd3cab916d8a7d;hb=8a8cd0f5bb40dcfad68608193e8c57decd90b25e;hp=e3b0db55894dfb4705ed5c052594d6469fb6332d;hpb=8b2c02c8d6255583982e767374d39375b3380c4d;p=paraslash.git

diff --git a/afs.c b/afs.c
index e3b0db55..49aabafb 100644
--- a/afs.c
+++ b/afs.c
@@ -26,6 +26,7 @@
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
 #include "db.h"
+#include "afh.h"
 #include "afs.h"
 #include "send.h"
 #include "error.h"
@@ -40,7 +41,6 @@ static struct timeval eof_barrier;
 extern struct misc_meta_data *mmd;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
-extern struct gengetopt_args_info conf;
 
 static FILE *audio_file = NULL;
 
@@ -197,7 +197,7 @@ int guess_audio_format(const char *name)
 				continue;
 			if (strcasecmp(name + len - plen, p))
 				continue;
-			PARA_DEBUG_LOG("might be %s\n", audio_format_name(i));
+//			PARA_DEBUG_LOG("might be %s\n", audio_format_name(i));
 			return i;
 		}
 	}
@@ -393,6 +393,10 @@ char *afs_get_header(int *header_len)
 		return NULL;
 	return afl[mmd->audio_format].get_header_info(header_len);
 }
+const char *supported_audio_formats(void)
+{
+	return SUPPORTED_AUDIO_FORMATS;
+}
 
 /**
  * get the chunk time of the current audio file
@@ -417,9 +421,9 @@ struct timeval *afs_chunk_time(void)
  * and acted upon by calling appropriate functions from the lower layers.
  * Possible actions include
  *
- * 	- request a new file list from the current dabase tool (audio file change)
+ * 	- request a new file list from the current audio file selector
  *	- shutdown of all senders (stop/pause command)
- *	- repositioning of the stream (ff/jmp command)
+ *	- reposition the stream (ff/jmp command)
  *
  * \return A pointer to a struct timeval containing the timeout for the next
  * chunk of data to be sent, or NULL if we're not sending right now.