X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=f0c1e43586aecebb45f3fac3732fa274eac54690;hp=b6132edf7bc3740c55836df48d62d66c9ee5609e;hb=672e27768e31a6eaa6854d4fc75ee6885db9abd8;hpb=3062b9da4f71ea236f46efda9a51add1b15cda1a

diff --git a/ogg_afh.c b/ogg_afh.c
index b6132edf..f0c1e435 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,13 +9,12 @@
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
+#include <osl.h>
 
 #include "para.h"
-#include "afh.h"
 #include "error.h"
+#include "afh.h"
 #include "string.h"
-#include "afs.h"
-#include "server.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
@@ -207,60 +206,43 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 	struct afh_info *afhi, long unsigned time_total)
 {
 	int i, ret, num;
-	ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
 	long unsigned num_chunks;
+	ogg_int64_t max = 0, min = 0, old_pos = 0;
 
-	old_pos = 0;
-	ret = 0;
 	num = time_total / chunk_time + 3;
 	PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
 		chunk_time, num);
 	afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
 	afhi->chunk_table[0] = 0;
-	max_chunk_len = 0;
-	for (i = 1; ret <= num; i++) {
-		ogg_int64_t diff;
+	for (i = 1; i <= num; i++) {
+		ogg_int64_t diff, pos;
 		ret = ov_time_seek(of, i * chunk_time);
 		if (ret)
 			break;
 		pos = ov_raw_tell(of);
 		diff = pos - old_pos;
-		max_chunk_len = PARA_MAX(max_chunk_len, diff);
+		max = PARA_MAX(max, diff);
 		min = (i == 1)? diff : PARA_MIN(min, diff);
 		afhi->chunk_table[i] = pos;
-//		if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
-//			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;
-//fi->chunk_table[i] = pos;
-	PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
-		num_chunks, chunk_time, max_chunk_len, min);
+	PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %lld, min chunk: %lld\n",
+		num_chunks, chunk_time, (long long)max, (long long)min);
 	return num_chunks;
 }
 
-static void ogg_write_info_string(OggVorbis_File *vf, struct afh_info *afhi)
+static void ogg_get_vorbis_comments(OggVorbis_File *vf, struct afh_info *afhi)
 {
-	char *taginfo;
 	vorbis_comment *vc = ov_comment(vf,-1);
 
-	if (vc) {
-		char *artist, *title, *album, *year, *comment;
-		artist = vorbis_comment_query(vc, "artist", 0);
-		title = vorbis_comment_query(vc, "title", 0);
-		album = vorbis_comment_query(vc, "album", 0);
-		year = vorbis_comment_query(vc, "year", 0);
-		comment = vorbis_comment_query(vc, "comment", 0);
-		taginfo = make_taginfo(title, artist, album, year, comment);
-	} else
-		taginfo = make_message("%s: (no vorbis comments found)\n%s:\n",
-			status_item_list[SI_TAGINFO1],
-			status_item_list[SI_TAGINFO2]);
-	afhi->info_string = make_message("%s:\n%s",
-		status_item_list[SI_AUDIO_FILE_INFO], taginfo);
-	free(taginfo);
+	if (!vc)
+		return;
+	afhi->tags.artist = para_strdup(vorbis_comment_query(vc, "artist", 0));
+	afhi->tags.title = para_strdup(vorbis_comment_query(vc, "title", 0));
+	afhi->tags.album = para_strdup(vorbis_comment_query(vc, "album", 0));
+	afhi->tags.year = para_strdup(vorbis_comment_query(vc, "year", 0));
+	afhi->tags.comment = para_strdup(vorbis_comment_query(vc, "comment", 0));
 }
 
 /*
@@ -297,8 +279,7 @@ static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total);
 	afhi->chunk_tv.tv_sec = 0;
 	afhi->chunk_tv.tv_usec = 250 * 1000;
-	tv_scale(10 / afhi->channels, &afhi->chunk_tv, &afhi->eof_tv);
-	ogg_write_info_string(&of, afhi);
+	ogg_get_vorbis_comments(&of, afhi);
 	ret = 1;
 err:
 	ov_clear(&of); /* keeps the file open */