X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg.c;h=3445970bd867acfbcd7ad52a1df1a58edd9bf691;hp=0c7b20ea47a8350860c19fe2de7c3eba8b4d0e9f;hb=f3ebfd3dcb117f1c4a91c2c9f08d8ed710ee3907;hpb=d1bfba58e0a93444c7381e9029eda5e786b2fa02

diff --git a/ogg.c b/ogg.c
index 0c7b20ea..3445970b 100644
--- a/ogg.c
+++ b/ogg.c
@@ -24,6 +24,7 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "afs.h"
+#include "afh.h"
 #include "error.h"
 #include "string.h"
 
@@ -35,8 +36,8 @@ static OggVorbis_File *oggvorbis_file;
 static FILE *infile;
 static int header_len, oggbuf_len, vi_channels;
 static char *header, *oggbuf;
-static ogg_int64_t *chunk_table, max_chunk_len;
-struct audio_format *af;
+static ssize_t *chunk_table, max_chunk_len;
+struct audio_format_handler *af;
 static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
 	num_chunks;
 
@@ -46,7 +47,7 @@ static int ogg_compute_header_len(void)
 	unsigned int serial;
 	char *buf;
 	ogg_page page;
-        ogg_packet packet;
+	ogg_packet packet;
 	vorbis_comment vc;
 	vorbis_info vi;
 	ogg_stream_state *stream_in = para_malloc(sizeof(ogg_stream_state));
@@ -152,7 +153,7 @@ static void tunetable(void)
 static void ogg_compute_chunk_table(double time_total)
 {
 	int i, ret, num;
-	ogg_int64_t pos = 0, min = 0, old_pos;
+	ssize_t pos = 0, min = 0, old_pos;
 
 	old_pos = 0;
 	ret = 0;
@@ -170,19 +171,19 @@ static void ogg_compute_chunk_table(double time_total)
 			break;
 		pos = ov_raw_tell(oggvorbis_file);
 		diff = pos - old_pos;
-		max_chunk_len = MAX(max_chunk_len, diff);
-		min = (i == 1)? diff : MIN(min, diff);
+		max_chunk_len = PARA_MAX(max_chunk_len, diff);
+		min = (i == 1)? diff : PARA_MIN(min, diff);
 		chunk_table[i] = pos;
 		if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
-			PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %lli, "
-				"size: %lli\n", i - 1,
+			PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
+				"size: %zd\n", i - 1,
 				i * chunk_time, pos, pos - old_pos);
 		old_pos = pos;
 	}
 	num_chunks = i - 1;
 	chunk_table[i] = pos;
 	tunetable();
-	PARA_INFO_LOG("%li chunks (%fs), max chunk: %lli, min chunk: %lli\n",
+	PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
 		num_chunks, chunk_time, max_chunk_len, min);
 	rewind(infile);
 }
@@ -345,7 +346,8 @@ static char *ogg_get_header_info(int *len)
 	return header;
 }
 
-void ogg_init(void *p)
+static const char* ogg_suffixes[] = {"ogg", NULL};
+void ogg_init(struct audio_format_handler *p)
 {
 	af = p;
 	af->reposition_stream = ogg_reposition_stream;
@@ -356,4 +358,5 @@ void ogg_init(void *p)
 	af->chunk_tv.tv_sec = 0;
 	af->chunk_tv.tv_usec = 250 * 1000;
 	tv_scale(3, &af->chunk_tv, &af->eof_tv);
+	af->suffixes = ogg_suffixes;
 }