X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3_afh.c;h=df7b85ee790905e2446f05feac534040e83fdf45;hb=d4776878609698ca63c99c3db711ae3edf038bba;hp=46fcfbca6102ab37be3b071c014a078fb738a46c;hpb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b;p=paraslash.git

diff --git a/mp3_afh.c b/mp3_afh.c
index 46fcfbca..df7b85ee 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -17,10 +17,11 @@
  */
 
 #include "para.h"
-#include "afh.h"
-#include "server.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 */
 
@@ -133,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;
 
@@ -271,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;
@@ -316,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;
@@ -402,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;