X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=e91c6c2b343b464fd2d9ff0472eff52bdd21cae9;hp=c633f92f23615b490395253b7869fd7f219511b0;hb=337d7784b0f8bc30b1fa9af56ace503acd97d40d;hpb=6bdac07456cb5872f824028912d1049883a9c21f

diff --git a/ogg_afh.c b/ogg_afh.c
index c633f92f..e91c6c2b 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -9,6 +9,7 @@
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
+#include <osl.h>
 
 #include "para.h"
 #include "afh.h"
@@ -210,7 +211,6 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 	long unsigned num_chunks;
 	ogg_int64_t max = 0, min = 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);
@@ -234,26 +234,17 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 	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));
 }
 
 /*
@@ -290,8 +281,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 */