diff options
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream.c | 2 | ||||
| -rw-r--r-- | stream/stream_cdda.c | 2 | ||||
| -rw-r--r-- | stream/stream_dvb.c | 1 | ||||
| -rw-r--r-- | stream/stream_file.c | 5 | ||||
| -rw-r--r-- | stream/stream_ftp.c | 2 | ||||
| -rw-r--r-- | stream/stream_lavf.c | 1 | ||||
| -rw-r--r-- | stream/stream_smb.c | 1 |
7 files changed, 1 insertions, 13 deletions
diff --git a/stream/stream.c b/stream/stream.c index d27b3f5f3f..7dc7bb61ac 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -397,7 +397,6 @@ eof_out: return 0; } // When reading succeeded we are obviously not at eof. - // This e.g. avoids issues with eof getting stuck when lavf seeks in MPEG-TS s->eof = 0; s->pos += len; stream_capture_write(s, buf, len); @@ -421,7 +420,6 @@ void stream_unread_buffer(stream_t *s, void *buffer, size_t buffer_size) memcpy(s->buffer, buffer, buffer_size); s->buf_pos = 0; s->buf_len = buffer_size + remainder; - s->eof = 0; } int stream_fill_buffer(stream_t *s) diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 1bec7dcc37..c19c71d64f 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -200,7 +200,6 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len) return -1; if ((p->sector < p->start_sector) || (p->sector > p->end_sector)) { - s->eof = 1; return 0; } @@ -237,7 +236,6 @@ static int seek(stream_t *s, int64_t newpos) s->pos = newpos; sec = s->pos / CDIO_CD_FRAMESIZE_RAW; if (s->pos < 0 || sec > p->end_sector) { - s->eof = 1; p->sector = p->end_sector + 1; return 0; } diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 3fa1b289a0..40c27f9aac 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -541,7 +541,6 @@ int dvb_set_channel(stream_t *stream, int card, int n) stream->buf_pos = stream->buf_len = 0; stream->pos = 0; - stream->eof = 0; if(channel->freq != priv->last_freq) if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone, diff --git a/stream/stream_file.c b/stream/stream_file.c index 8b587e6048..5797aef59f 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -55,8 +55,6 @@ static const struct m_struct_st stream_opts = { static int fill_buffer(stream_t *s, char* buffer, int max_len){ int r = read(s->fd,buffer,max_len); - // We are certain this is EOF, do not retry - if (max_len && r == 0) s->eof = 1; return (r <= 0) ? -1 : r; } @@ -76,7 +74,6 @@ static int write_buffer(stream_t *s, char* buffer, int len) { static int seek(stream_t *s,int64_t newpos) { s->pos = newpos; if(lseek(s->fd,s->pos,SEEK_SET)<0) { - s->eof=1; return 0; } return 1; @@ -89,7 +86,7 @@ static int seek_forward(stream_t *s,int64_t newpos) { } while(s->pos<newpos){ int len=s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE); - if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; break; } // EOF + if(len<=0){ s->buf_pos=s->buf_len=0; break; } // EOF s->buf_pos=0; s->buf_len=len; s->pos+=len; diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c index 03a8826d16..77537e08fd 100644 --- a/stream/stream_ftp.c +++ b/stream/stream_ftp.c @@ -337,7 +337,6 @@ static int seek(stream_t *s,int64_t newpos) { char rsp_txt[256]; if(s->pos > s->end_pos) { - s->eof=1; return 0; } @@ -376,7 +375,6 @@ static int seek(stream_t *s,int64_t newpos) { resp = readresp(p,rsp_txt); if(resp != 4 && resp != 2) { mp_msg(MSGT_OPEN,MSGL_ERR, "[ftp] Server didn't abort correctly: %s\n",rsp_txt); - s->eof = 1; return 0; } // Send the ABOR command diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 4afdc7244d..2e97eac19d 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -60,7 +60,6 @@ static int seek(stream_t *s, int64_t newpos) return -1; s->pos = newpos; if (avio_seek(avio, s->pos, SEEK_SET) < 0) { - s->eof = 1; return 0; } return 1; diff --git a/stream/stream_smb.c b/stream/stream_smb.c index 3b67d6c88d..33b13f7a11 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -88,7 +88,6 @@ static int control(stream_t *s, int cmd, void *arg) { static int seek(stream_t *s,int64_t newpos) { s->pos = newpos; if(smbc_lseek(s->fd,s->pos,SEEK_SET)<0) { - s->eof=1; return 0; } return 1; |