X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=df7b85ee790905e2446f05feac534040e83fdf45;hp=dde71c505f8180d103d03d387e366a0427ccec4c;hb=a6e79f02b6eab623425686f8f3cab5bc942e77d4;hpb=f6f50d03a09d6bc423324206d274336e9905bbb4

diff --git a/mp3_afh.c b/mp3_afh.c
index dde71c50..df7b85ee 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -16,9 +16,12 @@
  *			 Johannes Overmann <overmann@iname.com>
  */
 
-#include "server.h"
+#include "para.h"
 #include "error.h"
+#include "afh.h"
 #include "string.h"
+#include "afs.h"
+#include "server.h"
 
 /** \cond some defines and structs which are only used in this file */
 
@@ -131,7 +134,7 @@ static int frame_length(struct mp3header *header)
 		+ header->padding;
 }
 
-static void write_info_str(struct audio_format_info *afi)
+static void write_info_str(struct afh_info *afi)
 {
 	int v = mp3.id3_isvalid;
 
@@ -269,7 +272,7 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos)
 		return;
 	*fpos = numbytes - 128;
 	if (strncmp("TAG", (char *) map + *fpos, 3)) {
-		PARA_INFO_LOG("%s", "no id3 tag\n");
+		PARA_DEBUG_LOG("%s", "no id3 tag\n");
 		return;
 	}
 	*fpos = numbytes - 125;
@@ -314,7 +317,7 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos)
 }
 
 static int mp3_read_info(unsigned char *map, size_t numbytes,
-		struct audio_format_info *afi)
+		struct afh_info *afi)
 {
 	long fl_avg = 0, freq_avg = 0, br_avg = 0;
 	int ret, len = 0, old_br = -1;
@@ -400,7 +403,7 @@ err_out:
  * Read mp3 information from audio file
  */
 int mp3_get_file_info(char *map, size_t numbytes,
-		struct audio_format_info *afi)
+		struct afh_info *afi)
 {
 	int ret;