Attachment 35452 Details for Bug 57227 – patch-dagrab.c.1

patch-dagrab.c.1

patch-dagrab.c.1 (text/plain), 2.21 KB, created by vkushnir on 2003-09-26 00:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vkushnir

Created: 2003-09-26 00:00:39 UTC

Size: 2.21 KB

patch

obsolete

>*** /usr/ports/audio/dagrab/work/dagrab-0.3.5/dagrab.c	Wed Sep 24 01:39:03 2003
>--- dagrab.c	Wed Sep 24 01:42:20 2003
>***************
>*** 104,109 ****
>--- 104,110 ----
>  #include <sys/socket.h>
>  #include <netinet/in.h>
>  #include <sys/cdio.h>
>+ #include <sys/cdrio.h>
>  #include <sys/param.h>
>  #include <sys/mount.h>
>  #define CDDEVICE "/dev/cdrom"
>***************
>*** 248,262 ****
>  	/*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32)
>  	  jitter correction may be required inside the block. */					   
>  {
>! 	struct ioc_read_audio ra;
>! 
>! 	ra.address.lba=lba;
>! 	ra.address_format=CD_LBA_FORMAT;
>! 	ra.nframes=num;
>! 	ra.buffer=buf;
>! 	if(ioctl(cdrom_fd,CDIOCREADAUDIO,&ra)){
>  		/*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/
>! 		fprintf(stderr,"\n%s: read raw ioctl failed at lba %d length %d: %s\n",
>  				progname,lba,num,strerror(errno));
>  		exit(1);
>  	}
>--- 249,262 ----
>  	/*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32)
>  	  jitter correction may be required inside the block. */					   
>  {
>! 	int bsize = 2352;
>!         if(ioctl(cdrom_fd,CDRIOCSETBLOCKSIZE,&bsize) == -1) {
>! 		fprintf(stderr, "setblocksize");
>! 		exit(1);
>!         }
>! 	if (pread(cdrom_fd, buf, num*bsize, lba*bsize) != num*bsize){
>  		/*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/
>! 		fprintf(stderr,"\n%s: read device at lba %d length %d: %s\n",
>  				progname,lba,num,strerror(errno));
>  		exit(1);
>  	}
>***************
>*** 687,693 ****
>  	}
>  	tl->starts[tl->max-tl->min+1]=ntohl(Te.entry.addr.lba);
>  	tl->types[tl->max-tl->min+1]=Te.entry.control&CDROM_DATA_TRACK;
>! 	
>          i=cddb_main(tl);
>  	if(i==-1) {
>  	  fprintf(stderr,"%s: error retrieving cddb data\n",PROGNAME);
>--- 687,693 ----
>  	}
>  	tl->starts[tl->max-tl->min+1]=ntohl(Te.entry.addr.lba);
>  	tl->types[tl->max-tl->min+1]=Te.entry.control&CDROM_DATA_TRACK;
>! 
>          i=cddb_main(tl);
>  	if(i==-1) {
>  	  fprintf(stderr,"%s: error retrieving cddb data\n",PROGNAME);
>***************
>*** 1096,1101 ****
>--- 1096,1102 ----
>  	    }
>  	  }
>  	};
>+ 
>  	if(opt_verbose) fprintf(stderr,
>  			"sectors %3d overlap %3d key length %3d retrys %4d offset %3d\n",
>  			opt_blocks,opt_overlap,opt_keylen,opt_retrys,opt_ofs);

Actions: View

Attachments on bug 57227: 35452