X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=b9d24331148263bfeca4ae075a989ca89eeeb3fb;hp=41ef1e21b126968dd7d7fe9bdf8a11f964a28782;hb=4c80bf4a2082c4922094f7e8ce75193edb6be80f;hpb=f3ebfd3dcb117f1c4a91c2c9f08d8ed710ee3907

diff --git a/afs.c b/afs.c
index 41ef1e21..b9d24331 100644
--- a/afs.c
+++ b/afs.c
@@ -41,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;
 
@@ -198,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;
 		}
 	}
@@ -289,14 +288,15 @@ free:
 }
 
 static int chk_barrier(const char *bname, const struct timeval *now,
-		const struct timeval *barrier, struct timeval *diff, int log)
+		const struct timeval *barrier, struct timeval *diff,
+		int print_log)
 {
 	long ms;
 
 	if (tv_diff(now, barrier, diff) > 0)
 		return 1;
 	ms = tv2ms(diff);
-	if (log && ms)
+	if (print_log && ms)
 		PARA_DEBUG_LOG("%s barrier: %lims left\n", bname, ms);
 	return -1;
 }
@@ -422,9 +422,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.