RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

Make the end_sector accessable (it should be).

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25410 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ulion 2007-12-15 15:38:38 +00:00
parent f30650e3b5
commit 88a2c17be2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stream/stream_cdda.c
View File

@ -261,7 +261,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
st->priv = priv; st->priv = priv;
st->start_pos = priv->start_sector*CD_FRAMESIZE_RAW; st->start_pos = priv->start_sector*CD_FRAMESIZE_RAW;
st->end_pos = priv->end_sector*CD_FRAMESIZE_RAW; st->end_pos = (priv->end_sector + 1) * CD_FRAMESIZE_RAW;
st->type = STREAMTYPE_CDDA; st->type = STREAMTYPE_CDDA;
st->sector_size = CD_FRAMESIZE_RAW; st->sector_size = CD_FRAMESIZE_RAW;
@ -289,6 +289,11 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) {
int16_t * buf; int16_t * buf;
int i; int i;
if((p->sector < p->start_sector) || (p->sector > p->end_sector)) {
s->eof = 1;
return 0;
}
buf = paranoia_read(p->cdp,cdparanoia_callback); buf = paranoia_read(p->cdp,cdparanoia_callback);
if (!buf) if (!buf)
return 0; return 0;
@ -302,11 +307,6 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) {
s->pos = p->sector*CD_FRAMESIZE_RAW; s->pos = p->sector*CD_FRAMESIZE_RAW;
memcpy(buffer,buf,CD_FRAMESIZE_RAW); memcpy(buffer,buf,CD_FRAMESIZE_RAW);
if((p->sector < p->start_sector) || (p->sector >= p->end_sector)) {
s->eof = 1;
return 0;
}
for(i=0;i<p->cd->tracks;i++){ for(i=0;i<p->cd->tracks;i++){
if(p->cd->disc_toc[i].dwStartSector==p->sector-1) { if(p->cd->disc_toc[i].dwStartSector==p->sector-1) {
cd_track = cd_info_get_track(p->cd_info, i+1); cd_track = cd_info_get_track(p->cd_info, i+1);
@ -333,7 +333,7 @@ static int seek(stream_t* s,off_t newpos) {
s->pos = newpos; s->pos = newpos;
sec = s->pos/CD_FRAMESIZE_RAW; sec = s->pos/CD_FRAMESIZE_RAW;
if (s->pos < 0 || sec >= p->end_sector) { if (s->pos < 0 || sec > p->end_sector) {
s->eof = 1; s->eof = 1;
return 0; return 0;
} }