[xiph-commits] r15188 - trunk/cdparanoia/interface

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-08-16 01:35:23 -0700 (Sat, 16 Aug 2008)
New Revision: 15188

Modified:
   trunk/cdparanoia/interface/cooked_interface.c
Log:
Several fixes to ioctl timing in cooked_interface



Modified: trunk/cdparanoia/interface/cooked_interface.c
===================================================================
--- trunk/cdparanoia/interface/cooked_interface.c	2008-08-16 07:36:21 UTC (rev 15187)
+++ trunk/cdparanoia/interface/cooked_interface.c	2008-08-16 08:35:23 UTC (rev 15188)
@@ -19,8 +19,9 @@
   if(ret1<0 || ret3<0){
     d->private->last_milliseconds=-1;
   }else{
-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_usec-tv1.tv_usec)/1000;
+    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_usec-tv1.tv_usec)/1000.;
   }
+  return ret2;
 }
 
 static int cooked_readtoc (cdrom_drive *d){
@@ -99,7 +100,7 @@
   retry_count=0;
 
   do {
-    if((err=ioctl(d->ioctl_fd, CDROMREADAUDIO, &arg))){
+    if((err=timed_ioctl(d,d->ioctl_fd, CDROMREADAUDIO, &arg))){
       if(!d->error_retry){
 	ret=-7;
 	goto done;