/*
- * 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.
*/
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;
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;
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 */