[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-07-08 17:42:59
Message-ID: 20040708174259.9C55016B02 () office ! kde ! org
[Download RAW message or body]

CVS commit by kernalex: 

correct usage of device name


  M +1 -0      cdda.c   1.8
  M +5 -2      plat_linux_cdda.c   1.15


--- kdemultimedia/kscd/libwm/cdda.c  #1.7:1.8
@@ -113,4 +113,5 @@ gen_cdda_init( struct wm_drive *d )
     dev.numblocks = NUMBLOCKS;
     dev.status = WM_CDM_UNKNOWN;
+    dev.devname = d->cd_device;
 
     if ((ret = wmcdda_init(&dev)))

--- kdemultimedia/kscd/libwm/plat_linux_cdda.c  #1.14:1.15
@@ -89,4 +89,7 @@ wmcdda_init(struct cdda_device* pdev)
         return -1;
 
+    if(!pdev->devname)
+      return -1;
+      
     for (i = 0; i < pdev->numblocks; i++) {
         /* in Linux const */
@@ -99,5 +102,5 @@ wmcdda_init(struct cdda_device* pdev)
     }
       
-    pdev->fd = open(pdev->devname?pdev->devname:"/dev/cdrom", O_RDONLY | O_NONBLOCK);
+    pdev->fd = open(pdev->devname, O_RDONLY | O_NONBLOCK);
 
     if (pdev->fd > -1) {


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