diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-06-13 21:28:52 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-06-13 21:28:52 +0000 |
| commit | f85a943fdff3f12db8faf4b84e4f63aafdc60db3 (patch) | |
| tree | e16cc52e6b9a9548714a1ee31a5265ff34127467 /src/demuxers/demux_nsf.c | |
| parent | 62f8ce9ec67fb85da1023b5db90a0a5f1609cff7 (diff) | |
| download | xine-lib-f85a943fdff3f12db8faf4b84e4f63aafdc60db3.tar.gz xine-lib-f85a943fdff3f12db8faf4b84e4f63aafdc60db3.tar.bz2 | |
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
Diffstat (limited to 'src/demuxers/demux_nsf.c')
| -rw-r--r-- | src/demuxers/demux_nsf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c index b76cd2cec..dae756d8d 100644 --- a/src/demuxers/demux_nsf.c +++ b/src/demuxers/demux_nsf.c @@ -30,7 +30,7 @@ * For more information regarding the NSF format, visit: * http://www.tripoint.org/kevtris/nes/nsfspec.txt * - * $Id: demux_nsf.c,v 1.21 2004/01/09 01:26:33 miguelfreitas Exp $ + * $Id: demux_nsf.c,v 1.22 2004/06/13 21:28:54 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -142,8 +142,7 @@ static int demux_nsf_send_chunk(demux_plugin_t *this_gen) { else buf->size = buf->max_size; - buf->extra_info->input_pos = 0; - buf->extra_info->input_length = 0; + buf->extra_info->input_normpos = 0; buf->extra_info->input_time = 0; buf->pts = 0; @@ -171,8 +170,8 @@ static int demux_nsf_send_chunk(demux_plugin_t *this_gen) { buf->decoder_info[1] = 0; buf->type = BUF_AUDIO_NSF; - buf->extra_info->input_pos = this->current_song - 1; - buf->extra_info->input_length = this->total_songs; + if(this->total_songs) + buf->extra_info->input_normpos = (this->current_song - 1) * 65535 / this->total_songs; buf->extra_info->input_time = this->current_pts / 90; buf->pts = this->current_pts; buf->size = 0; @@ -238,6 +237,8 @@ static int demux_nsf_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time, int playing) { demux_nsf_t *this = (demux_nsf_t *) this_gen; + start_pos = (off_t) ( (double) start_pos / 65535 * + this->total_songs ); /* if thread is not running, initialize demuxer */ if( !playing ) { |