From f85a943fdff3f12db8faf4b84e4f63aafdc60db3 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Sun, 13 Jun 2004 21:28:52 +0000 Subject: implement steps 1, 2, 3 and 4 of the seeking proposal: http://article.gmane.org/gmane.comp.video.xine.devel/9532 it is now up to demuxers to decide what the 0..65535 position means. demuxers tested: ogg, voc, flac, rm, asf, vqa, vob, avi, y4m, au, mov, ts, mp3, mpg, wav, ra, mve CVS patchset: 6686 CVS date: 2004/06/13 21:28:52 --- src/libsputext/demux_sputext.c | 4 ++-- src/libsputext/xine_decoder.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libsputext') diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 9a754b62f..a35eba0a3 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.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_sputext.c,v 1.35 2004/06/11 09:47:30 valtri Exp $ + * $Id: demux_sputext.c,v 1.36 2004/06/13 21:28:57 miguelfreitas Exp $ * * code based on old libsputext/xine_decoder.c * @@ -1431,6 +1431,6 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 24, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, + { PLUGIN_DEMUX, 25, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index 07f520f0d..15846f870 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/xine_decoder.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: xine_decoder.c,v 1.82 2004/06/11 09:47:30 valtri Exp $ + * $Id: xine_decoder.c,v 1.83 2004/06/13 21:28:57 miguelfreitas Exp $ * */ @@ -626,12 +626,12 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); - lprintf("master: %d slave: %d input_pos: %lld vo_discard: %d\n", - master_status, slave_status, extra_info.input_pos, vo_discard); + lprintf("master: %d slave: %d input_normpos: %lld vo_discard: %d\n", + master_status, slave_status, extra_info.input_normpos, vo_discard); if( !this->started && (master_status == XINE_STATUS_PLAY && slave_status == XINE_STATUS_PLAY && - extra_info.input_pos) ) { + extra_info.input_normpos) ) { lprintf("started\n"); this->width = this->height = 0; -- cgit v1.2.3