summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2003-11-23 23:20:56 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2003-11-23 23:20:56 +0000
commit4f591c826f6daad4913c24fee3699224ff8be0d5 (patch)
tree3005d4c6efc1fb6d361169938ce22e3bae95f614 /src/demuxers
parent31057fce7b6ac70bcde8e2f791f82895e50a4971 (diff)
downloadxine-lib-4f591c826f6daad4913c24fee3699224ff8be0d5.tar.gz
xine-lib-4f591c826f6daad4913c24fee3699224ff8be0d5.tar.bz2
Implement seek timeout in RIP and drop input capability INPUT_CAP_SLOW_SEEK.
Check for seek success in mp3 and avi demuxers. CVS patchset: 5775 CVS date: 2003/11/23 23:20:56
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_avi.c3
-rw-r--r--src/demuxers/demux_mpgaudio.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 2c201e0dc..8a86840fe 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.180 2003/11/23 00:57:06 tmattern Exp $
+ * $Id: demux_avi.c,v 1.181 2003/11/23 23:20:57 valtri Exp $
*
* demultiplexer for avi streams
*
@@ -753,6 +753,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
xine_log (this->stream->xine, XINE_LOG_MSG,
_("demux_avi: failed to seek to the next chunk (pos %lld)\n"),
next_chunk);
+ break; /* probably slow seek */
}
}
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 076d4f396..25d00ed54 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpgaudio.c,v 1.125 2003/11/16 23:33:43 f1rmb Exp $
+ * $Id: demux_mpgaudio.c,v 1.126 2003/11/23 23:20:57 valtri Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -809,14 +809,14 @@ static void demux_mpgaudio_send_headers (demux_plugin_t *this_gen) {
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
/* read id3 info only from inputs with seeking and without "live" flag */
- if ((this->input->get_capabilities(this->input) & (INPUT_CAP_SEEKABLE | INPUT_CAP_SLOW_SEEK)) == INPUT_CAP_SEEKABLE) {
+ if (this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE != 0) {
off_t pos;
/* check ID3 v1 at the end of the stream */
pos = this->input->get_length(this->input) - 128;
if(pos > 0) {
- this->input->seek (this->input, pos, SEEK_SET);
- read_id3_tags (this);
+ if (pos == this->input->seek (this->input, pos, SEEK_SET))
+ read_id3_tags (this);
}
}