From: <rb...@fr...> - 2004-10-11 12:19:00
|
CVS Root: /home/cvs/gstreamer Module: gst-plugins Changes by: rbultje Date: Mon Oct 11 2004 05:18:54 PDT Log message: * ext/cdparanoia/gstcdparanoia.c: (cdparanoia_open), (cdparanoia_event), (cdparanoia_query): Get rid of hideous lead-in. Modified files: . : ChangeLog ext/cdparanoia : gstcdparanoia.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1160&r2=1.1161 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/cdparanoia/gstcdparanoia.c.diff?r1=1.43&r2=1.44 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1160 retrieving revision 1.1161 diff -u -d -r1.1160 -r1.1161 --- ChangeLog 11 Oct 2004 12:07:15 -0000 1.1160 +++ ChangeLog 11 Oct 2004 12:18:42 -0000 1.1161 @@ -1,3 +1,9 @@ +2004-10-11 Ronald S. Bultje <rb...@ro...> + + * ext/cdparanoia/gstcdparanoia.c: (cdparanoia_open), + (cdparanoia_event), (cdparanoia_query): + Get rid of hideous lead-in. 2004-10-11 Wim Taymans <wi...@fl...> * gst/playback/gstplaybasebin.c: (setup_source): Index: gstcdparanoia.c RCS file: /home/cvs/gstreamer/gst-plugins/ext/cdparanoia/gstcdparanoia.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gstcdparanoia.c 11 Oct 2004 12:02:09 -0000 1.43 +++ gstcdparanoia.c 11 Oct 2004 12:18:42 -0000 1.44 @@ -729,8 +729,8 @@ cdda_speed_set (src->d, src->read_speed); } - /* save thse ones */ - src->first_sector = cdda_disc_firstsector (src->d); + /* save thse ones - skip lead-in */ + src->first_sector = cdda_track_firstsector (src->d, 1); src->last_sector = cdda_disc_lastsector (src->d); /* this is the default segment we will play */ @@ -911,6 +911,7 @@ } /* do we need to update the start sector? */ if (seg_start_sector != -1) { + seg_start_sector += src->first_sector; seg_start_sector = CLAMP (seg_start_sector, src->first_sector, src->last_sector); @@ -924,6 +925,7 @@ } if (seg_end_sector != -1) { + seg_end_sector += src->first_sector; seg_end_sector = CLAMP (seg_end_sector, src->segment_end_sector = seg_end_sector; @@ -1101,20 +1103,23 @@ /* we take the last sector + 1 so that we also have the full * size of that last sector */ res = gst_pad_convert (src->srcpad, - sector_format, src->last_sector + 1, format, value); + sector_format, src->last_sector + 1 - src->first_sector, + format, value); break; case GST_QUERY_POSITION: /* bring our current sector to the requested format */ - sector_format, src->cur_sector, format, value); + sector_format, src->cur_sector - src->first_sector, format, value); case GST_QUERY_START: - sector_format, src->segment_start_sector, format, value); + sector_format, src->segment_start_sector - src->first_sector, case GST_QUERY_SEGMENT_END: - sector_format, src->segment_end_sector, format, value); + sector_format, src->segment_end_sector - src->first_sector, default: res = FALSE; |