X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=11f7f5ad53a9a1f999fa7c7076d88df3aeb4407b;hp=40bf925ca9dcee0b755f90e26e37129026d451fc;hb=e0b7f590a37c672994946405e19385bb8f4bbb37;hpb=102f171a26add0f0e06f22eeace58047e7f0d956

diff --git a/ogg_afh.c b/ogg_afh.c
index 40bf925c..11f7f5ad 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -157,7 +157,6 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 		goto err2;
 	PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
 	ogg_stream_packetin(stream_out, &packet);
-
 	ret = ogg_sync_pageout(sync_in, &page);
 	if (ret <= 0) {
 		ret = -E_SYNC_PAGEOUT;
@@ -235,10 +234,32 @@ 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)
+{
+	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);
+}
+
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
-static int ogg_get_file_info(char *map, size_t numbytes,
+static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 		struct afh_info *afhi)
 {
 	int ret;
@@ -267,15 +288,10 @@ static int ogg_get_file_info(char *map, size_t numbytes,
 	afhi->bitrate = ov_bitrate(&of, 0) / 1000;
 	afhi->channels = vi->channels;
 	afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total);
-	afhi->info_string[0] = '\0';
-	sprintf(afhi->info_string, "%s:\n%s:\n%s:\n",
-		status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAGINFO1],
-		status_item_list[SI_TAGINFO2]
-	);
 	afhi->chunk_tv.tv_sec = 0;
 	afhi->chunk_tv.tv_usec = 250 * 1000;
-	tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
+	tv_scale(10 / afhi->channels, &afhi->chunk_tv, &afhi->eof_tv);
+	ogg_write_info_string(&of, afhi);
 	ret = 1;
 err:
 	ov_clear(&of); /* keeps the file open */