[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/kscd/libwm
From:       Alex Kern <alex.kern () gmx ! de>
Date:       2004-08-18 21:24:03
Message-ID: 20040818212403.19AE91CC3 () office ! kde ! org
[Download RAW message or body]

CVS commit by kernalex: 

correct formal errors from Bug 87394, unfortunatelly I don't have a solaris to check it out.

P.S. Where is a rich and kindly person, which does a donation ;-)


  M +19 -15    plat_sun_cdda.c   1.8


--- kdemultimedia/kscd/libwm/plat_sun_cdda.c  #1.7:1.8
@@ -98,4 +98,5 @@ wmcdda_init(struct cdda_device* pdev, st
 {
   struct cdrom_cdda     cdda;
+  int i;
 
   if (pdev->fd > -1)
@@ -110,5 +111,5 @@ wmcdda_init(struct cdda_device* pdev, st
   }
 
-  pdev->fd = open(devname, 0);
+  pdev->fd = open(pdev->devname, 0);
   if (pdev->fd == -1)
     pdev->fd = open("/dev/rdsk/c0t6d0s2", 0);
@@ -121,14 +122,14 @@ wmcdda_init(struct cdda_device* pdev, st
                 cdda.cdda_subcode = CDROM_DA_SUBQ;
 
-                if (ioctl(init_fd, CDROMCDDA, &cdda) < 0)
+                if (ioctl(pdev->fd, CDROMCDDA, &cdda) < 0)
                 {
-                        block->status = WMCDDA_STOPPED;
+                        block->status = WM_CDM_STOPPED;
                         return -1;
                 } else {
-                  block->status = WMCDDA_STOPPED;
+                  block->status = WM_CDM_STOPPED;
                   return 0;
                 }
         } else {
-            block->status = WMCDDA_EJECTED;
+            block->status = WM_CDM_EJECTED;
             return -1;
         }
@@ -139,6 +140,8 @@ wmcdda_init(struct cdda_device* pdev, st
  */
 int
-wmcdda_close(int fd)
+wmcdda_close(struct cdda_device* pdev)
 {
+    int i;
+ 
     if(-1 == pdev->fd)
         return -1;
@@ -199,5 +202,5 @@ wmcdda_read(struct cdda_device* pdev, st
         (direction < 0 && current_position < starting_position))
     {
-        block->status = WMCDDA_DONE;
+        block->status = WM_CDM_TRACK_DONE;
         return (0);
     }
@@ -208,5 +211,5 @@ wmcdda_read(struct cdda_device* pdev, st
     else
         cdda.cdda_length = pdev->frames_at_once;
-    cdda.cdda_data = pdev->buf;
+    cdda.cdda_data = (unsigned char*)block->buf;
     cdda.cdda_subcode = CDROM_DA_SUBQ;
 
@@ -215,5 +218,5 @@ wmcdda_read(struct cdda_device* pdev, st
         if (errno == ENXIO)     /* CD ejected! */
         {
-            block->status = WMCDDA_EJECTED;
+            block->status = WM_CDM_EJECTED;
             return (-1);
         }
@@ -227,5 +230,5 @@ wmcdda_read(struct cdda_device* pdev, st
                 {
                     perror("CDROMCDDA");
-                    block->status = WMCDDA_ERROR;
+                    block->status = WM_CDM_CDDAERROR;
                     return (-1);
                 }
@@ -255,10 +258,11 @@ wmcdda_read(struct cdda_device* pdev, st
         if (*q == 1)
         {
-            block->status = WMCDDA_OK;
             block->track =  unbcd[q[1]];
             block->index =  unbcd[q[2]];
-            block->minute = unbcd[q[7]];
-            block->second = unbcd[q[8]];
+            /*block->minute = unbcd[q[7]];
+            block->second = unbcd[q[8]];*/
             block->frame =  unbcd[q[9]];
+            block->status = WM_CDM_PLAYING;
+            block->buflen = cdda.nframes * CDDABLKSIZE;
         }
     }
@@ -280,5 +284,5 @@ wmcdda_normalize(struct cdda_block *bloc
 {
         int             i, nextq;
-        long buflen = block->buflen
+        long buflen = block->buflen;
         int             blocks = buflen / CDDABLKSIZE;
         unsigned char *rawbuf = block->buf;


[prev in list] [next in list] [prev in thread] [next in thread]