From 0d8b551c5a3aeadfd6901469946078d5a95ecb42 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:05 +0200 Subject: added parameter total_time to decoder_initialized() Similar to the previous patch: pass total_time instead of manipulating dc->totalTime directly. --- src/inputPlugins/oggvorbis_plugin.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/inputPlugins/oggvorbis_plugin.c') diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index 2fb0a9e52..e53e27de7 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -262,9 +262,6 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) } return 0; } - dc.totalTime = ov_time_total(&vf, -1); - if (dc.totalTime < 0) - dc.totalTime = 0; audio_format.bits = 16; while (1) { @@ -285,7 +282,11 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) audio_format.channels = vi->channels; audio_format.sampleRate = vi->rate; if (dc.state == DECODE_STATE_START) { - decoder_initialized(decoder, &audio_format); + float total_time = ov_time_total(&vf, -1); + if (total_time < 0) + total_time = 0; + decoder_initialized(decoder, &audio_format, + total_time); } comments = ov_comment(&vf, -1)->user_comments; putOggCommentsIntoOutputBuffer(inStream->metaName, -- cgit v1.2.3