diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-30 02:09:24 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-30 02:09:24 +0000 |
| commit | e15e6e8d897798fc20041e032b0a30d7374953e0 (patch) | |
| tree | 46645855d82d0996b3ca8b646ba230bdb7763aca /src/demuxers/demux_mpeg_block.c | |
| parent | d0ca54350cfff5d52b7d7e835082062c46fce353 (diff) | |
| download | xine-lib-e15e6e8d897798fc20041e032b0a30d7374953e0.tar.gz xine-lib-e15e6e8d897798fc20041e032b0a30d7374953e0.tar.bz2 | |
Fixed demux* get current position calls.
Fixed stdin/fifo input plugin, new mrl style: fifo://[mpeg1|mpeg2]/location
Fixed dvd input plugin.
xine core, update cur_input_pos position.
call the gui status callback now.
CVS patchset: 102
CVS date: 2001/05/30 02:09:24
Diffstat (limited to 'src/demuxers/demux_mpeg_block.c')
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 2c23f5d3a..2abc7119d 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.8 2001/05/28 12:08:20 f1rmb Exp $ + * $Id: demux_mpeg_block.c,v 1.9 2001/05/30 02:09:24 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -223,7 +223,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this) { buf->type = BUF_SPU_PACKAGE + nSPUID; buf->PTS = nPTS; buf->DTS = nDTS ; - buf->input_pos = this->input->seek (this->input, 0, SEEK_CUR); + buf->input_pos = this->input->get_current_pos(this->input); this->spu_fifo->put (this->spu_fifo, buf); @@ -240,7 +240,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this) { buf->type = BUF_AUDIO_AC3 + nTrack; buf->PTS = nPTS; buf->DTS = nDTS ; - buf->input_pos = this->input->seek (this->input, 0, SEEK_CUR); + buf->input_pos = this->input->get_current_pos(this->input); if(this->audio_fifo) this->audio_fifo->put (this->audio_fifo, buf); @@ -264,7 +264,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this) { buf->type = BUF_AUDIO_LPCM + nTrack; buf->PTS = nPTS; buf->DTS = nDTS ; - buf->input_pos = this->input->seek (this->input, 0, SEEK_CUR); + buf->input_pos = this->input->get_current_pos(this->input); if(this->audio_fifo) this->audio_fifo->put (this->audio_fifo, buf); @@ -281,7 +281,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this) { buf->type = BUF_VIDEO_MPEG; buf->PTS = nPTS; buf->DTS = nDTS; - buf->input_pos = this->input->seek (this->input, 0, SEEK_CUR); + buf->input_pos = this->input->get_current_pos(this->input); this->video_fifo->put (this->video_fifo, buf); @@ -299,7 +299,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this) { buf->type = BUF_AUDIO_MPEG + nTrack; buf->PTS = nPTS; buf->DTS = nDTS; - buf->input_pos = this->input->seek (this->input, 0, SEEK_CUR); + buf->input_pos = this->input->get_current_pos(this->input); if(this->audio_fifo) this->audio_fifo->put (this->audio_fifo, buf); @@ -461,7 +461,6 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, media = strstr(MRL, "://"); if(media) { if(!strncmp(MRL, "dvd", 3) - || !strncmp(MRL, "fifo", 4) || (((!strncmp(MRL, "stdin", 5) || !strncmp(MRL, "fifo", 4)) && (!strncmp((media+3), "mpeg2", 5) ))) ) { |