diff options
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/vorbis_decoder_plugin.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/decoder/vorbis_decoder_plugin.c b/src/decoder/vorbis_decoder_plugin.c index 12a6623b2..0163ca9ff 100644 --- a/src/decoder/vorbis_decoder_plugin.c +++ b/src/decoder/vorbis_decoder_plugin.c @@ -245,19 +245,10 @@ vorbis_send_comments(struct decoder *decoder, struct input_stream *is, } static bool -oggvorbis_seekable(struct decoder *decoder) +oggvorbis_seekable(const struct input_stream *is) { - char *uri; - bool seekable; - - uri = decoder_get_uri(decoder); - /* disable seeking on remote streams, because libvorbis seeks - around like crazy, and due to being very expensive, this - delays song playback by 10 or 20 seconds */ - seekable = !uri_has_scheme(uri); - g_free(uri); - - return seekable; + return is->seekable && + (is->uri == NULL || !uri_has_scheme(is->uri)); } /* public */ @@ -289,7 +280,7 @@ vorbis_stream_decode(struct decoder *decoder, data.decoder = decoder; data.input_stream = input_stream; - data.seekable = input_stream->seekable && oggvorbis_seekable(decoder); + data.seekable = oggvorbis_seekable(input_stream); callbacks.read_func = ogg_read_cb; callbacks.seek_func = ogg_seek_cb; |