Rename struct audio_format_info to afh_info.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 71ee7e309c48f86fd3a1c1cb1f09840a1ff66d1b..f4f375cbea76480de87838612569eaf47cd9f658 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -12,9 +12,10 @@
 
 #include "para.h"
 #include "afh.h"
-#include "server.h"
 #include "error.h"
 #include "string.h"
+#include "afs.h"
+#include "server.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
@@ -111,7 +112,7 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks
 }
 
 static int ogg_compute_header_len(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afi)
 {
        int ret;
        size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
@@ -197,7 +198,7 @@ err1:
  * CHUNK_TIME begins. Always successful.
  */
 static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
-       struct audio_format_info *afi, long unsigned time_total)
+       struct afh_info *afi, long unsigned time_total)
 {
        int i, ret, num;
        ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
@@ -238,7 +239,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
  * Init oggvorbis file and write some tech data to given pointers.
  */
 static int ogg_get_file_info(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afi)
 {
        int ret;
        vorbis_info *vi;