oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-enable seeking in http streams.

Browse Source 
Fixing stopping mpd from block when trying to stop a ogg stream that is buffering.


git-svn-id: https://svn.musicpd.org/mpd/trunk@7053 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Qball Cow
2007-11-28 14:06:03 +00:00
parent 4447ce5065
commit e1571cc705
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/inputPlugins/oggvorbis_plugin.c
View File

@@ -87,7 +87,8 @@ static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
static int ogg_seek_cb(void *vdata, ogg_int64_t offset, int whence) static int ogg_seek_cb(void *vdata, ogg_int64_t offset, int whence)
{ {
OggCallbackData *data = (OggCallbackData *) vdata; OggCallbackData *data = (OggCallbackData *) vdata;
if(data->dc->stop)
return -1;
return seekInputStream(data->inStream, offset, whence); return seekInputStream(data->inStream, offset, whence);
} }
@@ -251,7 +252,6 @@ static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
callbacks.seek_func = ogg_seek_cb; callbacks.seek_func = ogg_seek_cb;
callbacks.close_func = ogg_close_cb; callbacks.close_func = ogg_close_cb;
callbacks.tell_func = ogg_tell_cb; callbacks.tell_func = ogg_tell_cb;
if ((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) { if ((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) {
closeInputStream(inStream); closeInputStream(inStream);
if (!dc->stop) { if (!dc->stop) {
@@ -284,14 +284,12 @@ static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
} }
return 0; return 0;
} }
dc->totalTime = ov_time_total(&vf, -1); dc->totalTime = ov_time_total(&vf, -1);
if (dc->totalTime < 0) if (dc->totalTime < 0)
dc->totalTime = 0; dc->totalTime = 0;
dc->audioFormat.bits = 16; dc->audioFormat.bits = 16;
while (!eof) { while (!eof && !dc->stop) {
if (dc->seek) { if (dc->seek) {
if (0 == ov_time_seek_page(&vf, dc->seekWhere)) { if (0 == ov_time_seek_page(&vf, dc->seekWhere)) {
clearOutputBuffer(cb); clearOutputBuffer(cb);
@@ -303,7 +301,6 @@ static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
ret = ov_read(&vf, chunk + chunkpos, ret = ov_read(&vf, chunk + chunkpos,
OGG_CHUNK_SIZE - chunkpos, OGG_CHUNK_SIZE - chunkpos,
OGG_DECODE_USE_BIGENDIAN, 2, 1, &current_section); OGG_DECODE_USE_BIGENDIAN, 2, 1, &current_section);
if (current_section != prev_section) { if (current_section != prev_section) {
/*printf("new song!\n"); */ /*printf("new song!\n"); */
vorbis_info *vi = ov_info(&vf, -1); vorbis_info *vi = ov_info(&vf, -1);

2
src/inputStream_http.c
View File

@@ -558,7 +558,7 @@ static int getHTTPHello(InputStream * inStream)
inStream->seekable = 0; inStream->seekable = 0;
rc = atoi(cur + 9); rc = atoi(cur + 9);
} else if (0 == strncmp(cur, "HTTP/1.1 ", 9)) { } else if (0 == strncmp(cur, "HTTP/1.1 ", 9)) {
inStream->seekable = 0; inStream->seekable = 1;
rc = atoi(cur + 9); rc = atoi(cur + 9);
} else if (0 == strncmp(cur, "ICY 200 OK", 10)) { } else if (0 == strncmp(cur, "ICY 200 OK", 10)) {
inStream->seekable = 0; inStream->seekable = 0;