Fix a bug in the mood line parser.

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index ae7f117bfaeac1841c6883388a4b2e16c7a31a97..df7b85ee790905e2446f05feac534040e83fdf45 100644 (file)
--- 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;
 
@@ -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;