mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/cdparanoia/gstcdparanoia.c: Get rid of hideous lead-in.

Browse source 
Original commit message from CVS:
* ext/cdparanoia/gstcdparanoia.c: (cdparanoia_open),
(cdparanoia_event), (cdparanoia_query):
Get rid of hideous lead-in.
This commit is contained in:
Ronald S. Bultje 2004-10-11 12:18:42 +00:00
parent 0e9b17a986
commit 1604717cbf
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-10-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/cdparanoia/gstcdparanoia.c: (cdparanoia_open),
(cdparanoia_event), (cdparanoia_query):
Get rid of hideous lead-in.
2004-10-11 Wim Taymans <wim@fluendo.com> 2004-10-11 Wim Taymans <wim@fluendo.com>
* gst/playback/gstplaybasebin.c: (setup_source): * gst/playback/gstplaybasebin.c: (setup_source):

17
ext/cdparanoia/gstcdparanoia.c
View file

@ -729,8 +729,8 @@ cdparanoia_open (CDParanoia * src)
cdda_speed_set (src->d, src->read_speed); cdda_speed_set (src->d, src->read_speed);
} }
/* save thse ones */ /* save thse ones - skip lead-in */
src->first_sector = cdda_disc_firstsector (src->d); src->first_sector = cdda_track_firstsector (src->d, 1);
src->last_sector = cdda_disc_lastsector (src->d); src->last_sector = cdda_disc_lastsector (src->d);
/* this is the default segment we will play */ /* this is the default segment we will play */
@ -911,6 +911,7 @@ cdparanoia_event (GstPad * pad, GstEvent * event)
} }
/* do we need to update the start sector? */ /* do we need to update the start sector? */
if (seg_start_sector != -1) { if (seg_start_sector != -1) {
seg_start_sector += src->first_sector;
seg_start_sector = CLAMP (seg_start_sector, seg_start_sector = CLAMP (seg_start_sector,
src->first_sector, src->last_sector); src->first_sector, src->last_sector);
@ -924,6 +925,7 @@ cdparanoia_event (GstPad * pad, GstEvent * event)
} }
} }
if (seg_end_sector != -1) { if (seg_end_sector != -1) {
seg_end_sector += src->first_sector;
seg_end_sector = CLAMP (seg_end_sector, seg_end_sector = CLAMP (seg_end_sector,
src->first_sector, src->last_sector); src->first_sector, src->last_sector);
src->segment_end_sector = seg_end_sector; src->segment_end_sector = seg_end_sector;
@ -1101,20 +1103,23 @@ cdparanoia_query (GstPad * pad, GstQueryType type,
/* we take the last sector + 1 so that we also have the full /* we take the last sector + 1 so that we also have the full
* size of that last sector */ * size of that last sector */
res = gst_pad_convert (src->srcpad, 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; break;
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
/* bring our current sector to the requested format */ /* bring our current sector to the requested format */
res = gst_pad_convert (src->srcpad, res = gst_pad_convert (src->srcpad,
sector_format, src->cur_sector, format, value); sector_format, src->cur_sector - src->first_sector, format, value);
break; break;
case GST_QUERY_START: case GST_QUERY_START:
res = gst_pad_convert (src->srcpad, res = gst_pad_convert (src->srcpad,
sector_format, src->segment_start_sector, format, value); sector_format, src->segment_start_sector - src->first_sector,
format, value);
break; break;
case GST_QUERY_SEGMENT_END: case GST_QUERY_SEGMENT_END:
res = gst_pad_convert (src->srcpad, res = gst_pad_convert (src->srcpad,
sector_format, src->segment_end_sector, format, value); sector_format, src->segment_end_sector - src->first_sector,
format, value);
break; break;
default: default:
res = FALSE; res = FALSE;