diff options
Diffstat (limited to 'stream/stream_cdda.c')
| -rw-r--r-- | stream/stream_cdda.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index a7555dc7b4..2403e85cd4 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -182,7 +182,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { } } #endif - + #ifndef CONFIG_LIBCDIO if(p->generic_dev) cdd = cdda_identify_scsi(p->generic_dev,p->device,0,NULL); @@ -280,7 +280,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { mode = PARANOIA_MODE_OVERLAP; else mode = PARANOIA_MODE_FULL; - + if(p->no_skip) mode |= PARANOIA_MODE_NEVERSKIP; #ifndef CONFIG_LIBCDIO @@ -336,7 +336,7 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) { cd_track_t *cd_track; int16_t * buf; int i; - + if((p->sector < p->start_sector) || (p->sector > p->end_sector)) { s->eof = 1; return 0; @@ -346,7 +346,7 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) { if (!buf) return 0; -#ifdef WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN for(i=0;i<CD_FRAMESIZE_RAW/2;i++) buf[i]=le2me_16(buf[i]); #endif @@ -359,14 +359,14 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) { cd_track = cd_info_get_track(p->cd_info, i+1); //printf("Track %d, sector=%d\n", i, p->sector-1); if( cd_track!=NULL ) { - mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name); + mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDA_TRACK=%d\n", cd_track->track_nb); } break; } } - + return CD_FRAMESIZE_RAW; } @@ -377,7 +377,7 @@ static int seek(stream_t* s,off_t newpos) { int current_track=0, seeked_track=0; int seek_to_track = 0; int i; - + s->pos = newpos; sec = s->pos/CD_FRAMESIZE_RAW; if (s->pos < 0 || sec > p->end_sector) { @@ -387,7 +387,7 @@ static int seek(stream_t* s,off_t newpos) { //printf("pos: %d, sec: %d ## %d\n", (int)s->pos, (int)sec, CD_FRAMESIZE_RAW); //printf("sector: %d new: %d\n", p->sector, sec ); - + for(i=0;i<p->cd->tracks;i++){ // printf("trk #%d: %d .. %d\n",i,p->cd->disc_toc[i].dwStartSector,p->cd->disc_toc[i+1].dwStartSector); if( p->sector>=p->cd->disc_toc[i].dwStartSector && p->sector<p->cd->disc_toc[i+1].dwStartSector ) { |